diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc27ee5f31a..ef8eaea0e00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 35ca90a2b67..b8070780d73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.25515.2 - 9.0.0-beta.25515.2 - 9.0.0-beta.25515.2 + 9.0.0-beta.25562.4 + 9.0.0-beta.25562.4 + 9.0.0-beta.25562.4 9.0.1 9.0.1-rtm.24610.9 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index a58c8a418e8..6b5ff28cc70 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -145,6 +145,11 @@ jobs: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 2ee8bbfff54..221d1ac6de1 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -305,6 +305,11 @@ stages: - task: NuGetAuthenticate@1 + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/cross/x64/tizen/tizen.patch b/eng/common/cross/x64/tizen/tizen.patch new file mode 100644 index 00000000000..56fbc881095 --- /dev/null +++ b/eng/common/cross/x64/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib64/libc.so b/usr/lib64/libc.so +--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-x86-64) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-x86-64.so.2 ) ) diff --git a/global.json b/global.json index c217069dcf6..de7d7e59a00 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.111", + "dotnet": "9.0.112", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp80Version)", @@ -22,7 +22,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25515.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25515.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25562.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25562.4" } }