Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dafny_interop_test_net.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
os: [
windows-latest,
ubuntu-latest,
macos-12,
macos-15,
]
runs-on: ${{ matrix.os }}
permissions:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dafny_interop_test_vector_net.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
os: [
windows-latest,
ubuntu-latest,
macos-12,
macos-15,
]
runs-on: ${{matrix.os}}
permissions:
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
matrix:
os: [
ubuntu-latest,
macos-12,
macos-15,
]
runs-on: ${{ matrix.os }}
permissions:
Expand Down Expand Up @@ -251,7 +251,7 @@ jobs:
matrix:
os: [
ubuntu-latest,
macos-12,
macos-15,
]
runs-on: ${{ matrix.os }}
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_dafny_verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
library: [
AwsEncryptionSDK
]
os: [ macos-12 ]
os: [ macos-15 ]
runs-on: ${{ matrix.os }}
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/library_interop_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
os: [
windows-latest,
ubuntu-latest,
macos-12,
macos-15,
]
runs-on: ${{ matrix.os }}
permissions:
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
matrix:
os: [
ubuntu-latest,
macos-12,
macos-15,
]
runs-on: ${{ matrix.os }}
permissions:
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
matrix:
os: [
ubuntu-latest,
macos-12,
macos-15,
]
runs-on: ${{ matrix.os }}
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_java_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
# TODO just test on mac for now
#windows-latest,
#ubuntu-latest,
macos-12
macos-15
]
runs-on: ${{ matrix.os }}
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_net_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
os: [
windows-latest,
ubuntu-latest,
macos-12,
macos-15,
]
runs-on: ${{ matrix.os }}
permissions:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ jobs:
pr-ci-codegen:
uses: ./.github/workflows/library_codegen.yml
with:
dafny: '4.8.0'
dafny: '4.9.0'
pr-ci-verification:
uses: ./.github/workflows/library_dafny_verification.yml
with:
dafny: '4.8.0'
dafny: '4.9.0'
# pr-ci-java:
# uses: ./.github/workflows/library_java_tests.yml
# with:
# dafny: '4.2.0'
pr-ci-net:
uses: ./.github/workflows/library_net_tests.yml
with:
dafny: '4.8.0'
dafny: '4.9.0'
pr-test-vectors:
uses: ./.github/workflows/library_interop_tests.yml
with:
dafny: '4.8.0'
dafny: '4.9.0'
2 changes: 1 addition & 1 deletion .github/workflows/sem_ver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
semantic-release:
runs-on: macos-12
runs-on: macos-15
permissions:
id-token: write
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semantic_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
# privileged operation, so we must make sure this list of users is a subset of the users labeled as maintainers of
# https://github.com/orgs/aws/teams/aws-crypto-tools
if: contains('["seebees","texastony","ShubhamChaturvedi7","lucasmcdonald3","josecorella","imabhichow","rishav-karanjit","antonf-amzn","justplaz","ajewellamz","RitvikKapila"]', github.actor)
runs-on: macos-12
runs-on: macos-15
permissions:
id-token: write
contents: write
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module Fixtures {

const branchKeyStoreName := "KeyStoreDdbTable"
const logicalKeyStoreName := branchKeyStoreName
const branchKeyId := "75789115-1deb-4fe3-a2ec-be9e885d1945"
const branchKeyId := "3f43a9af-08c5-4317-b694-3d3e883dcaef"

// UTF-8 encoded "aws-crypto-"
const RESERVED_ENCRYPTION_CONTEXT: UTF8.ValidUTF8Bytes :=
Expand Down
4 changes: 2 additions & 2 deletions AwsEncryptionSDK/project.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file stores the top level dafny version information.
# All elements of the project need to agree on this version.
dafnyVersion=4.8.1
dafnyRuntimeJavaVersion=4.8.1
dafnyVersion=4.9.0
dafnyRuntimeJavaVersion=4.9.0
6 changes: 6 additions & 0 deletions AwsEncryptionSDK/runtimes/net/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 4.1.1

### Notes

Update .csproj files to prevent use of AWS-SDK-NET V4

## 4.1.0

### Notes
Expand Down
8 changes: 3 additions & 5 deletions AwsEncryptionSDK/runtimes/net/ESDK.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<IsPackable>true</IsPackable>

<Version>4.1.0</Version>
<Version>4.1.1</Version>

<AssemblyName>AWS.Cryptography.EncryptionSDK</AssemblyName>
<PackageId>AWS.Cryptography.EncryptionSDK</PackageId>
Expand All @@ -30,10 +30,8 @@

<ItemGroup>
<!-- TODO: manually upgraded to match the latest from MPL, is that reasonable? -->
<PackageReference Include="AWSSDK.Core" Version="3.7.*" />
<PackageReference Include="DafnyRuntime" Version="4.8.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
<ProjectReference Include="../../../mpl/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj" />
<PackageReference Include="DafnyRuntime" Version="[4.9.0]" />
<PackageReference Include="AWS.Cryptography.MaterialProviders" Version="[1.7.6]" />
<!--
System.Collections.Immutable can be removed once dafny.msbuild is updated with
https://github.com/dafny-lang/dafny.msbuild/pull/10 and versioned
Expand Down
2 changes: 1 addition & 1 deletion mpl
Submodule mpl updated from 71cf95 to 1f2351
Loading