Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: bump up donet 8 #145

Merged
merged 5 commits into from
Dec 26, 2023
Merged

build: bump up donet 8 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3cc1cb
build: bump up dotnet 8
JeyJeyGao Nov 20, 2023
10f14a7
Squashed commit of the following:
JeyJeyGao Dec 25, 2023
4510ee3
build: bump up dotnet 8
JeyJeyGao Dec 25, 2023
9895efb
Merge branch 'main' into build/bump_up_dotnet8
JeyJeyGao Dec 25, 2023
94ca6f5
Squashed commit of the following:
JeyJeyGao Dec 25, 2023
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/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'
- name: Build .NET project
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:
contents: read
steps:
- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'
- name: Check out code into the project directory
uses: actions/checkout@v3
- name: Run unit tests
Expand Down
12 changes: 6 additions & 6 deletions Notation.Plugin.AzureKeyVault.Tests/Command/GenerateSignatureTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public void Constructor_Invalid()
}

[Fact]
public void RunAsync_NoSecertsGetPermission()
public async void RunAsync_NoSecertsGetPermission()
{
// Arrange
var keyId = "https://testvault.vault.azure.net/keys/testkey/123";
Expand All @@ -192,11 +192,11 @@ public void RunAsync_NoSecertsGetPermission()

var generateSignatureCommand = new GenerateSignature(request, mockKeyVaultClient.Object);

Assert.Throws<PluginException>(() => generateSignatureCommand.RunAsync().GetAwaiter().GetResult());
await Assert.ThrowsAsync<PluginException>(async () => await generateSignatureCommand.RunAsync());
}

[Fact]
public void RunAsync_OtherRequestFailedException()
public async void RunAsync_OtherRequestFailedException()
{
// Arrange
var keyId = "https://testvault.vault.azure.net/keys/testkey/123";
Expand All @@ -219,11 +219,11 @@ public void RunAsync_OtherRequestFailedException()

var generateSignatureCommand = new GenerateSignature(request, mockKeyVaultClient.Object);

Assert.Throws<Azure.RequestFailedException>(() => generateSignatureCommand.RunAsync().GetAwaiter().GetResult());
await Assert.ThrowsAsync<Azure.RequestFailedException>(async () => await generateSignatureCommand.RunAsync());
}

[Fact]
public void RunAsync_SelfSignedWithCaCerts()
public async void RunAsync_SelfSignedWithCaCerts()
{
// Arrange
var keyId = "https://testvault.vault.azure.net/keys/testkey/123";
Expand All @@ -246,7 +246,7 @@ public void RunAsync_SelfSignedWithCaCerts()

var generateSignatureCommand = new GenerateSignature(request, mockKeyVaultClient.Object);

Assert.Throws<PluginException>(() => generateSignatureCommand.RunAsync().GetAwaiter().GetResult());
await Assert.ThrowsAsync<PluginException>(async () => await generateSignatureCommand.RunAsync());
}
}
}
1 change: 0 additions & 1 deletion Notation.Plugin.AzureKeyVault.Tests/KeyVault/KeyVaultClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public void TestConstructorWithInvalidKeyId(string invalidKeyId)

[Theory]
[InlineData("")]
[InlineData(null)]
public void TestConstructorWithEmptyKeyId(string invalidKeyId)
{
Assert.Throws<ArgumentNullException>(() => new KeyVaultClient(invalidKeyId));
Expand Down
14 changes: 7 additions & 7 deletions Notation.Plugin.AzureKeyVault.Tests/Notation.Plugin.AzureKeyVault.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<OutputType>Library</OutputType>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="Moq.AutoMock" Version="3.5.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
4 changes: 0 additions & 4 deletions Notation.Plugin.AzureKeyVault.Tests/Protocol/DescribeKeyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ public void DescribeKeyRequest_ValidParameters()
}

[Theory]
[InlineData(null, "test-key-id")]
[InlineData("", "test-key-id")]
[InlineData("1.0", null)]
[InlineData("1.0", "")]
public void DescribeKeyRequest_InvalidParameters_ThrowsException(string contractVersion, string keyId)
{
Expand Down Expand Up @@ -60,9 +58,7 @@ public void DescribeKeyResponse_ValidParameters()
}

[Theory]
[InlineData(null, "RSA-2048")]
[InlineData("", "RSA-2048")]
[InlineData("test-key-id", null)]
[InlineData("test-key-id", "")]
public void DescribeKeyResponse_InvalidParameters_ThrowsException(string keyId, string keySpec)
{
Expand Down
6 changes: 3 additions & 3 deletions Notation.Plugin.AzureKeyVault/Notation.Plugin.AzureKeyVault.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Notation.Plugin.AzureKeyVault</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand All @@ -16,11 +16,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.8.2" />
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.5.1" />
<PackageReference Include="Azure.Security.KeyVault.Keys" Version="4.5.0" />
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.5.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
</ItemGroup>

<Target Name="GenerateBuildMetadata" BeforeTargets="CoreCompile">
Expand Down
Loading