diff --git a/Cargo.lock b/Cargo.lock index 379a2426..3f28fea1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "buildpacks-jvm-shared" version = "0.0.0" -source = "git+https://github.com/heroku/buildpacks-jvm?branch=malax%2Foutput#3ccb47f2943c3348029d9751fc1955586b4fe3f0" +source = "git+https://github.com/heroku/buildpacks-jvm?branch=malax%2Foutput#3b140fce22ba8f186f393676fb3f02acfee03b68" dependencies = [ "indoc", "java-properties", @@ -1267,7 +1267,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/buildpacks/dotnet/tests/dotnet_publish_test.rs b/buildpacks/dotnet/tests/dotnet_publish_test.rs index 147343a6..9b4c4b02 100644 --- a/buildpacks/dotnet/tests/dotnet_publish_test.rs +++ b/buildpacks/dotnet/tests/dotnet_publish_test.rs @@ -74,10 +74,10 @@ fn test_dotnet_publish_with_debug_configuration() { ), &formatdoc! {r" MSBuild version 17.8.3+195e7f5a3 for .NET - Determining projects to restore... - Restored /workspace/foo.csproj . - foo -> /workspace/bin/Debug/net8.0/{rid}/foo.dll - foo -> /workspace/bin/publish/"} + Determining projects to restore... + Restored /workspace/foo.csproj . + foo -> /workspace/bin/Debug/net8.0/{rid}/foo.dll + foo -> /workspace/bin/publish/"} ); }, ); @@ -92,22 +92,22 @@ fn test_dotnet_publish_with_global_json_and_custom_verbosity_level() { |context| { assert_empty!(context.pack_stderr); let rid = get_rid(); - assert_contains!( replace_msbuild_log_patterns_with_placeholder(&context.pack_stdout, ""), &formatdoc! {r#" - Publish solution - Using `Release` build configuration - - Running dotnet publish /workspace/foo.csproj --runtime {rid} -p:PublishDir=bin/publish --verbosity normal - MSBuild version 17.8.3+195e7f5a3 for .NET - Build started . - 1>Project "/workspace/foo.csproj" on node 1 (Restore target(s)). - 1>_GetAllRestoreProjectPathItems: - Determining projects to restore... - Restore: - X.509 certificate chain validation will use the fallback certificate bundle at '/layers/heroku_dotnet/sdk/sdk/8.0.101/trustedroots/codesignctl.pem'. - X.509 certificate chain validation will use the fallback certificate bundle at '/layers/heroku_dotnet/sdk/sdk/8.0.101/trustedroots/timestampctl.pem'. - Restoring packages for /workspace/foo.csproj..."#} + - Running `dotnet publish /workspace/foo.csproj --runtime {rid} -p:PublishDir=bin/publish --verbosity normal` + + MSBuild version 17.8.3+195e7f5a3 for .NET + Build started . + 1>Project "/workspace/foo.csproj" on node 1 (Restore target(s)). + 1>_GetAllRestoreProjectPathItems: + Determining projects to restore... + Restore: + X.509 certificate chain validation will use the fallback certificate bundle at '/layers/heroku_dotnet/sdk/sdk/8.0.101/trustedroots/codesignctl.pem'. + X.509 certificate chain validation will use the fallback certificate bundle at '/layers/heroku_dotnet/sdk/sdk/8.0.101/trustedroots/timestampctl.pem'. + Restoring packages for /workspace/foo.csproj..."#} ); assert_contains!( diff --git a/buildpacks/dotnet/tests/sdk_installation_test.rs b/buildpacks/dotnet/tests/sdk_installation_test.rs index 15ba05c9..77cab4cd 100644 --- a/buildpacks/dotnet/tests/sdk_installation_test.rs +++ b/buildpacks/dotnet/tests/sdk_installation_test.rs @@ -106,14 +106,14 @@ fn test_sdk_installation_with_global_json() { assert_empty!(context.pack_stderr); assert_contains!( context.pack_stdout, - &indoc! {r" + &indoc! {" - SDK version detection - Detected .NET file to publish: `/workspace/foo.csproj` - Detecting version requirement from root global.json file - Detected version requirement: `=8.0.101` - Resolved .NET SDK version `8.0.101` (linux-arm64) - SDK installation - - Downloading SDK from https://download.visualstudio.microsoft.com/download/pr/092bec24-9cad-421d-9b43-458b3a7549aa/84280dbd1eef750f9ed1625339235c22/dotnet-sdk-8.0.101-linux-arm64.tar.gz" + - Downloading SDK from `https://download.visualstudio.microsoft.com/download/pr/092bec24-9cad-421d-9b43-458b3a7549aa/84280dbd1eef750f9ed1625339235c22/dotnet-sdk-8.0.101-linux-arm64.tar.gz`" } ); assert_contains!(