feat(NET): support netstandard2.0 (#132)

smithy-lang · Dec 20, 2023 · 98a16a8 · 98a16a8
1 parent 8e40364
commit 98a16a8
Show file tree

Hide file tree

Showing 24 changed files with 92 additions and 10 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,3 +8,33 @@ updates:
  directory: ".github/workflows"
  schedule:
  interval: "daily"
+ # STD NET
+ - package-ecosystem: "nuget"
+ directory: "StandardLibrary/runtimes/net/STD.csproj"
+ schedule:
+ interval: "daily"
+ # KMS NET
+ - package-ecosystem: "nuget"
+ directory: "ComAmazonawsKms/runtimes/net/AWS-KMS.csproj"
+ schedule:
+ interval: "daily"
+ # DDB NET
+ - package-ecosystem: "nuget"
+ directory: "ComAmazonawsDynamodb/runtimes/net/ComAmazonawsDynamodb.csproj"
+ schedule:
+ interval: "daily"
+ # Crypto NET
+ - package-ecosystem: "nuget"
+ directory: "AwsCryptographyPrimitives/runtimes/net/Crypto.csproj"
+ schedule:
+ interval: "daily"
+ # MPL NET
+ - package-ecosystem: "nuget"
+ directory: "AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj"
+ schedule:
+ interval: "daily"
+ # Test Vectors NET
+ - package-ecosystem: "nuget"
+ directory: "TestVectorsAwsCryptographicMaterialProviders/runtimes/net/TestVectors.csproj"
+ schedule:
+ interval: "daily"
diff --git a/.github/workflows/library_net_tests.yml b/.github/workflows/library_net_tests.yml
@@ -70,7 +70,9 @@ jobs:
  CORES=$(node -e 'console.log(os.cpus().length)')
  make transpile_net CORES=$CORES
 
- # .NET Framework is only supported in Windows
+ # .NET Framework is a software development framework
+ # for building and running applications on Windows.
+ # https://dotnet.microsoft.com/en-us/learn/dotnet/what-is-dotnet-framework
  - name: Test ${{ matrix.library }} .NET Framework net48
  if: matrix.os == 'windows-latest'
  working-directory: ./${{ matrix.library }}
@@ -88,15 +90,25 @@ jobs:
  make test_net FRAMEWORK=net6.0
  fi
 
- - name: Test Cache Thread Safety
+ - name: Test Cache Thread Safety net6.0
  if: matrix.library == 'AwsCryptographicMaterialProviders'
  working-directory: ./${{ matrix.library }}
  shell: bash
- ## Run .NET 6.0 and .NET Framework net48
  run: |
  dotnet restore runtimes/net/tests/LocalCMC.Tests/
  dotnet build runtimes/net/tests/LocalCMC.Tests/
  dotnet test runtimes/net/tests/LocalCMC.Tests/ \
  --framework net6.0
+
+ # .NET Framework is a software development framework
+ # for building and running applications on Windows.
+ # https://dotnet.microsoft.com/en-us/learn/dotnet/what-is-dotnet-framework
+ - name: Test Cache Thread Safety .NET Framework net48
+ if: matrix.os == 'windows-latest' && matrix.library == 'AwsCryptographicMaterialProviders'
+ working-directory: ./${{ matrix.library }}
+ shell: bash
+ run: |
+ dotnet restore runtimes/net/tests/LocalCMC.Tests/
+ dotnet build runtimes/net/tests/LocalCMC.Tests/
  dotnet test runtimes/net/tests/LocalCMC.Tests/ \
  --framework net48
diff --git a/AwsCryptographicMaterialProviders/codebuild/release-staging.yml b/AwsCryptographicMaterialProviders/codebuild/release-staging.yml
@@ -29,6 +29,7 @@ phases:
  - export BASE=../codebuild/net
  - python $BASE/retrieve_signed_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/retrieve_signed_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
  build:
  commands:
  - mkdir build

diff --git a/AwsCryptographicMaterialProviders/codebuild/sign.yml b/AwsCryptographicMaterialProviders/codebuild/sign.yml
@@ -40,7 +40,9 @@ phases:
  - export BASE=../codebuild/net
  - python $BASE/upload_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/upload_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/upload_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
  ## Retrieve the signed assembly. We're not going to use it, but this
  ## ensures that the signing process is complete
  - python $BASE/retrieve_signed_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/retrieve_signed_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
diff --git a/AwsCryptographicMaterialProviders/codebuild/verify.yml b/AwsCryptographicMaterialProviders/codebuild/verify.yml
@@ -21,3 +21,8 @@ phases:
  - python codebuild/net/retrieve_signed_assembly.py --target net6.0 --unique-id $Env:UNIQUE_ID --output net6.0
  - $sig = Get-AuthenticodeSignature -FilePath net6.0/$Env:FILE_NAME
  - $sig | Format-List -Property *
+ # Check signature on netstandard2.0 dll
+ - mkdir netstandard2.0
+ - python codebuild/net/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $Env:UNIQUE_ID --output netstandard2.0
+ - $sig = Get-AuthenticodeSignature -FilePath netstandard2.0/$Env:FILE_NAME
+ - $sig | Format-List -Property *
diff --git a/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj b/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj
@@ -21,7 +21,7 @@
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>disable</Nullable>
  <LangVersion>10</LangVersion>
- <TargetFrameworks>net6.0;net48</TargetFrameworks>
+ <TargetFrameworks>net6.0;net48;netstandard2.0</TargetFrameworks>
  <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  <!--
  Ignore errors from generated code. Ideally this would be scoped to just the relevant files.

diff --git a/AwsCryptographyPrimitives/codebuild/release-staging.yml b/AwsCryptographyPrimitives/codebuild/release-staging.yml
@@ -29,6 +29,7 @@ phases:
  - export BASE=../codebuild/net
  - python $BASE/retrieve_signed_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/retrieve_signed_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
  build:
  commands:
  - mkdir build

diff --git a/AwsCryptographyPrimitives/codebuild/sign.yml b/AwsCryptographyPrimitives/codebuild/sign.yml
@@ -42,7 +42,9 @@ phases:
  - export BASE=../codebuild/net
  - python $BASE/upload_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/upload_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/upload_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
  ## Retrieve the signed assembly. We're not going to use it, but this
  ## ensures that the signing process is complete
  - python $BASE/retrieve_signed_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/retrieve_signed_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
diff --git a/AwsCryptographyPrimitives/codebuild/verify.yml b/AwsCryptographyPrimitives/codebuild/verify.yml
@@ -21,3 +21,8 @@ phases:
  - python codebuild/net/retrieve_signed_assembly.py --target net6.0 --unique-id $Env:UNIQUE_ID --output net6.0
  - $sig = Get-AuthenticodeSignature -FilePath net6.0/$Env:FILE_NAME
  - $sig | Format-List -Property *
+ # Check signature on netstandard2.0 dll
+ - mkdir netstandard2.0
+ - python codebuild/net/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $Env:UNIQUE_ID --output netstandard2.0
+ - $sig = Get-AuthenticodeSignature -FilePath netstandard2.0/$Env:FILE_NAME
+ - $sig | Format-List -Property *
diff --git a/AwsCryptographyPrimitives/runtimes/net/Crypto.csproj b/AwsCryptographyPrimitives/runtimes/net/Crypto.csproj
@@ -21,7 +21,7 @@
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>disable</Nullable>
  <LangVersion>10</LangVersion>
- <TargetFrameworks>net6.0;net48</TargetFrameworks>
+ <TargetFrameworks>net6.0;net48;netstandard2.0</TargetFrameworks>
  <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  <!--
  Ignore errors from generated code. Ideally this would be scoped to just the relevant files.

diff --git a/ComAmazonawsDynamodb/codebuild/release-staging.yml b/ComAmazonawsDynamodb/codebuild/release-staging.yml
@@ -29,6 +29,7 @@ phases:
  - export BASE=../codebuild/net
  - python $BASE/retrieve_signed_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/retrieve_signed_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
  build:
  commands:
  - mkdir build

diff --git a/ComAmazonawsDynamodb/codebuild/sign.yml b/ComAmazonawsDynamodb/codebuild/sign.yml
@@ -42,7 +42,9 @@ phases:
  - export BASE=../codebuild/net
  - python $BASE/upload_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/upload_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/upload_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
  ## Retrieve the signed assembly. We're not going to use it, but this
  ## ensures that the signing process is complete
  - python $BASE/retrieve_signed_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/retrieve_signed_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
diff --git a/ComAmazonawsDynamodb/codebuild/verify.yml b/ComAmazonawsDynamodb/codebuild/verify.yml
@@ -21,3 +21,8 @@ phases:
  - python codebuild/net/retrieve_signed_assembly.py --target net6.0 --unique-id $Env:UNIQUE_ID --output net6.0
  - $sig = Get-AuthenticodeSignature -FilePath net6.0/$Env:FILE_NAME
  - $sig | Format-List -Property *
+ # Check signature on netstandard2.0 dll
+ - mkdir netstandard2.0
+ - python codebuild/net/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $Env:UNIQUE_ID --output netstandard2.0
+ - $sig = Get-AuthenticodeSignature -FilePath netstandard2.0/$Env:FILE_NAME
+ - $sig | Format-List -Property *
diff --git a/ComAmazonawsDynamodb/runtimes/net/ComAmazonawsDynamodb.csproj b/ComAmazonawsDynamodb/runtimes/net/ComAmazonawsDynamodb.csproj
@@ -21,7 +21,7 @@
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>disable</Nullable>
  <LangVersion>10</LangVersion>
- <TargetFrameworks>net6.0;net48</TargetFrameworks>
+ <TargetFrameworks>net6.0;net48;netstandard2.0</TargetFrameworks>
  <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  <!--
  Ignore errors from generated code. Ideally this would be scoped to just the relevant files.

diff --git a/ComAmazonawsDynamodb/runtimes/net/tests/TestComAmazonawsDynamodb.csproj b/ComAmazonawsDynamodb/runtimes/net/tests/TestComAmazonawsDynamodb.csproj
@@ -4,7 +4,7 @@
  <RootNamespace>TEST_AWS_DDB</RootNamespace>
  <ImplicitUsings>disable</ImplicitUsings>
  <Nullable>disable</Nullable>
- <TargetFrameworks>net6.0;net48</TargetFrameworks>
+  <TargetFrameworks>net6.0;net48</TargetFrameworks>
  <LangVersion>10</LangVersion>
  <OutputType>Exe</OutputType>
  <EnableDefaultCompileItems>false</EnableDefaultCompileItems>

diff --git a/ComAmazonawsKms/codebuild/release-staging.yml b/ComAmazonawsKms/codebuild/release-staging.yml
@@ -29,6 +29,7 @@ phases:
  - export BASE=../codebuild/net
  - python $BASE/retrieve_signed_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/retrieve_signed_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
  build:
  commands:
  - mkdir build

diff --git a/ComAmazonawsKms/codebuild/sign.yml b/ComAmazonawsKms/codebuild/sign.yml
@@ -42,7 +42,9 @@ phases:
  - export BASE=../codebuild/net
  - python $BASE/upload_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/upload_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/upload_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
  ## Retrieve the signed assembly. We're not going to use it, but this
  ## ensures that the signing process is complete
  - python $BASE/retrieve_signed_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/retrieve_signed_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
diff --git a/ComAmazonawsKms/codebuild/verify.yml b/ComAmazonawsKms/codebuild/verify.yml
@@ -22,3 +22,8 @@ phases:
  - python codebuild/net/retrieve_signed_assembly.py --target net6.0 --unique-id $Env:UNIQUE_ID --output net6.0
  - $sig = Get-AuthenticodeSignature -FilePath net6.0/$Env:FILE_NAME
  - $sig | Format-List -Property *
+ # Check signature on netstandard2.0 dll
+ - mkdir netstandard2.0
+ - python codebuild/net/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $Env:UNIQUE_ID --output netstandard2.0
+ - $sig = Get-AuthenticodeSignature -FilePath netstandard2.0/$Env:FILE_NAME
+ - $sig | Format-List -Property *
diff --git a/ComAmazonawsKms/runtimes/net/AWS-KMS.csproj b/ComAmazonawsKms/runtimes/net/AWS-KMS.csproj
@@ -21,7 +21,7 @@
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>disable</Nullable>
  <LangVersion>10</LangVersion>
- <TargetFrameworks>net6.0;net48</TargetFrameworks>
+ <TargetFrameworks>net6.0;net48;netstandard2.0</TargetFrameworks>
  <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  <!--
  Ignore errors from generated code. Ideally this would be scoped to just the relevant files.

diff --git a/StandardLibrary/codebuild/release-staging.yml b/StandardLibrary/codebuild/release-staging.yml
@@ -29,6 +29,7 @@ phases:
  - export BASE=../codebuild/net
  - python $BASE/retrieve_signed_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/retrieve_signed_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
  build:
  commands:
  - mkdir build

diff --git a/StandardLibrary/codebuild/sign.yml b/StandardLibrary/codebuild/sign.yml
@@ -37,7 +37,9 @@ phases:
  - export BASE=../codebuild/net
  - python $BASE/upload_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/upload_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/upload_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
  ## Retrieve the signed assembly. We're not going to use it, but this
  ## ensures that the signing process is complete
  - python $BASE/retrieve_signed_assembly.py --target net6.0 --unique-id $UNIQUE_ID
  - python $BASE/retrieve_signed_assembly.py --target net48 --unique-id $UNIQUE_ID
+ - python $BASE/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $UNIQUE_ID
diff --git a/StandardLibrary/codebuild/verify.yml b/StandardLibrary/codebuild/verify.yml
@@ -22,3 +22,8 @@ phases:
  - python codebuild/net/retrieve_signed_assembly.py --target net6.0 --unique-id $Env:UNIQUE_ID --output net6.0
  - $sig = Get-AuthenticodeSignature -FilePath net6.0/$Env:FILE_NAME
  - $sig | Format-List -Property *
+ # Check signature on netstandard2.0 dll
+ - mkdir netstandard2.0
+ - python codebuild/net/retrieve_signed_assembly.py --target netstandard2.0 --unique-id $Env:UNIQUE_ID --output netstandard2.0
+ - $sig = Get-AuthenticodeSignature -FilePath netstandard2.0/$Env:FILE_NAME
+ - $sig | Format-List -Property *
diff --git a/StandardLibrary/runtimes/net/STD.csproj b/StandardLibrary/runtimes/net/STD.csproj
@@ -21,7 +21,7 @@
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>disable</Nullable>
  <LangVersion>10</LangVersion>
- <TargetFrameworks>net6.0;net48</TargetFrameworks>
+ <TargetFrameworks>net6.0;net48;netstandard2.0</TargetFrameworks>
  <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  <!--
  Ignore errors from generated code. Ideally this would be scoped to just the relevant files.

diff --git a/TestVectorsAwsCryptographicMaterialProviders/runtimes/net/TestVectors.csproj b/TestVectorsAwsCryptographicMaterialProviders/runtimes/net/TestVectors.csproj
@@ -5,7 +5,7 @@
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>disable</Nullable>
  <LangVersion>10</LangVersion>
- <TargetFrameworks>net6.0;net48</TargetFrameworks>
+ <TargetFrameworks>net6.0;net48;netstandard2.0</TargetFrameworks>
  <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
  <OutputType>Exe</OutputType>
  </PropertyGroup>