From aa8caade9bc8da7f8b914034fb838367ca4a1946 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:09:35 +0000 Subject: [PATCH 01/37] Update dependencies from https://github.com/dotnet/arcade build 20231004.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23504.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 6 +++--- global.json | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd4316b4b2..06a0d2b179 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23504.4"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha> + <Sha>f1868a684ed9766d4247d672fd5f96bba4d4bb00</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> @@ -27,9 +27,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>84a3d0e37e8f22b0b55f8bf932cb788b2bdd728f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> + <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23502.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Uri>https://github.com/dotnet/xliff-tasks</Uri> - <Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha> + <Sha>0f36b29fb7374379609c3ee6a0b70caf457d8a0e</Sha> <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0"> diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 6c4ac6fec1..91f8196cc8 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aa74ab4a81..84cfe7cd9c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } # Minimum VS version to require. - $vsMinVersionReqdStr = '17.6' + $vsMinVersionReqdStr = '17.7' $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2 - $defaultXCopyMSBuildVersion = '17.6.0-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1 + $defaultXCopyMSBuildVersion = '17.7.2-1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 2eb87ee25d..0fa2471642 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.7.23376.3", + "dotnet": "8.0.100-rc.1.23455.8", "runtimes": { "dotnet": [ "3.1.7", @@ -13,11 +13,11 @@ "xcopy-msbuild": "16.10.0-preview2" }, "sdk": { - "version": "8.0.100-preview.7.23376.3", + "version": "8.0.100-rc.1.23455.8", "allowPrerelease": true, "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23504.4" } } From 37f734d9208378ac1a830ebbe9adce221f453815 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 12:10:59 +0000 Subject: [PATCH 02/37] Update dependencies from https://github.com/dotnet/arcade build 20231006.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06a0d2b179..e1ada458fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23504.4"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23506.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>f1868a684ed9766d4247d672fd5f96bba4d4bb00</Sha> + <Sha>c5245c4f1d1074087d6bd0e5b311dc9544729172</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/global.json b/global.json index 0fa2471642..e218c2cebe 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23504.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.1" } } From 97a7f7547cbd683ff7c64fb7588ce525631ea594 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Oct 2023 12:10:38 +0000 Subject: [PATCH 03/37] Update dependencies from https://github.com/dotnet/arcade build 20231006.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1ada458fe..878a78c276 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23506.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23506.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c5245c4f1d1074087d6bd0e5b311dc9544729172</Sha> + <Sha>1bb0c0184e96b4f2f05d78f117e8805e00d6ae42</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/global.json b/global.json index e218c2cebe..d69673856a 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.2" } } From 2bb1ddb9ab9e0d932d17f1b992fff3e20ddabb61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Oct 2023 12:10:31 +0000 Subject: [PATCH 04/37] Update dependencies from https://github.com/dotnet/arcade build 20231006.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk From fc3016509b5993c1fd98d4af7a9f87a00ee819cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 12:11:15 +0000 Subject: [PATCH 05/37] Update dependencies from https://github.com/dotnet/arcade build 20231008.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23508.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 878a78c276..88bc8d3060 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23506.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23508.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>1bb0c0184e96b4f2f05d78f117e8805e00d6ae42</Sha> + <Sha>822f095b8c815dd7b9161140a9ff8151de593f82</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/global.json b/global.json index d69673856a..6bf539f61a 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23506.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23508.1" } } From c4b70910e9e8a30c79cd5cc713682dc0a010fe91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 12:13:11 +0000 Subject: [PATCH 06/37] Update dependencies from https://github.com/dotnet/arcade build 20231010.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 4 ++-- eng/common/post-build/check-channel-consistency.ps1 | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88bc8d3060..36fbc448f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23508.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23510.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>822f095b8c815dd7b9161140a9ff8151de593f82</Sha> + <Sha>3e1ba969512d5dc45f0885bab7338fe7f14d9689</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/eng/common/post-build/check-channel-consistency.ps1 b/eng/common/post-build/check-channel-consistency.ps1 index 63f3464c98..1728f035a9 100644 --- a/eng/common/post-build/check-channel-consistency.ps1 +++ b/eng/common/post-build/check-channel-consistency.ps1 @@ -7,7 +7,7 @@ try { . $PSScriptRoot\post-build-utils.ps1 if ($PromoteToChannels -eq "") { - Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." + Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." ExitWithExitCode 0 } diff --git a/global.json b/global.json index 6bf539f61a..45502c68ff 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23508.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.1" } } From 4f6c9fb7d1bd12f923235130d4945426c1476e46 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 12:10:43 +0000 Subject: [PATCH 07/37] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36fbc448f8..5f0fa9122b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23510.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23510.4"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>3e1ba969512d5dc45f0885bab7338fe7f14d9689</Sha> + <Sha>0e89c8d7ddbb54510d9d0a757fda5126021b79f0</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> @@ -27,9 +27,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>84a3d0e37e8f22b0b55f8bf932cb788b2bdd728f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23502.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> + <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23509.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Uri>https://github.com/dotnet/xliff-tasks</Uri> - <Sha>0f36b29fb7374379609c3ee6a0b70caf457d8a0e</Sha> + <Sha>4f761bf529f4be49842b13d7efcef9af87f0a973</Sha> <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0"> diff --git a/global.json b/global.json index 45502c68ff..293a6862f7 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.4" } } From b6fb44b97c1a7047fc974ad7454af6f3b6ebf3a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 12:09:51 +0000 Subject: [PATCH 08/37] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk From bf6f4cf37a7b2526c66f38ee9bbeb1895efef49f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 12:10:08 +0000 Subject: [PATCH 09/37] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk From b83d5f09399f81678426ab3c62711a1d9da5ea00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Oct 2023 12:09:41 +0000 Subject: [PATCH 10/37] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk From 82a157c8e6d9e3b761bf9260ee2cb9fe368fb727 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 15 Oct 2023 12:08:52 +0000 Subject: [PATCH 11/37] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk From 5817fde8bb0381f8a791c8cbe355268240a18161 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 12:09:40 +0000 Subject: [PATCH 12/37] Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk From e32e24e35fdf72ffa4930cd895ba6a27af39ab34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:11:18 +0000 Subject: [PATCH 13/37] Update dependencies from https://github.com/dotnet/arcade build 20231016.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23516.5 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 4 ++-- eng/common/build.sh | 2 +- eng/common/cross/build-rootfs.sh | 2 +- eng/common/cross/riscv64/tizen/tizen.patch | 9 +++++++++ eng/common/cross/tizen-build-rootfs.sh | 21 +++++++++++++++++++++ eng/common/cross/tizen-fetch.sh | 17 ++++++++++++++--- eng/common/cross/toolchain.cmake | 19 +++++++++++++------ eng/common/sdk-task.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 6 +++--- 11 files changed, 68 insertions(+), 20 deletions(-) create mode 100644 eng/common/cross/riscv64/tizen/tizen.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f0fa9122b..528ab4ba00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23510.4"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23516.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>0e89c8d7ddbb54510d9d0a757fda5126021b79f0</Sha> + <Sha>a672b7bba499394acf218dc59171e2d53e754237</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/eng/common/build.sh b/eng/common/build.sh index 50af40cdd2..2c17ba529b 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do -binarylog|-bl) binary_log=true ;; - -excludeCIBinarylog|-nobl) + -excludecibinarylog|-nobl) exclude_ci_binary_log=true ;; -pipelineslog|-pl) diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9caf9b021d..4228f202e5 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \ - search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')" + search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')" fi # install all packages in one go diff --git a/eng/common/cross/riscv64/tizen/tizen.patch b/eng/common/cross/riscv64/tizen/tizen.patch new file mode 100644 index 0000000000..eb6d1c0747 --- /dev/null +++ b/eng/common/cross/riscv64/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/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-littleriscv) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) ) diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh index ac84173d44..ba31c93285 100644 --- a/eng/common/cross/tizen-build-rootfs.sh +++ b/eng/common/cross/tizen-build-rootfs.sh @@ -22,6 +22,10 @@ case "$ARCH" in TIZEN_ARCH="x86_64" LINK_ARCH="x86" ;; + riscv64) + TIZEN_ARCH="riscv64" + LINK_ARCH="riscv" + ;; *) echo "Unsupported architecture for tizen: $ARCH" exit 1 @@ -58,4 +62,21 @@ rm -rf $TIZEN_TMP_DIR echo ">>Start configuring Tizen rootfs" ln -sfn asm-${LINK_ARCH} ./usr/include/asm patch -p1 < $__TIZEN_CROSSDIR/tizen.patch +if [[ "$TIZEN_ARCH" == "riscv64" ]]; then + echo "Fixing broken symlinks in $PWD" + rm ./usr/lib64/libresolv.so + ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so + rm ./usr/lib64/libpthread.so + ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so + rm ./usr/lib64/libdl.so + ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so + rm ./usr/lib64/libutil.so + ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so + rm ./usr/lib64/libm.so + ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so + rm ./usr/lib64/librt.so + ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so + rm ./lib/ld-linux-riscv64-lp64d.so.1 + ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1 +fi echo "<<Finish configuring Tizen rootfs" diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh index c18de68d3e..c15c506695 100644 --- a/eng/common/cross/tizen-fetch.sh +++ b/eng/common/cross/tizen-fetch.sh @@ -156,17 +156,28 @@ fetch_tizen_pkgs() done } +if [ "$TIZEN_ARCH" == "riscv64" ]; then + BASE="Tizen-Base-RISCV" + UNIFIED="Tizen-Unified-RISCV" +else + BASE="Tizen-Base" + UNIFIED="Tizen-Unified" +fi + Inform "Initialize ${TIZEN_ARCH} base" -fetch_tizen_pkgs_init standard Tizen-Base +fetch_tizen_pkgs_init standard $BASE Inform "fetch common packages" fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils Inform "fetch coreclr packages" -fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu +fetch_tizen_pkgs ${TIZEN_ARCH} libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu +if [ "$TIZEN_ARCH" != "riscv64" ]; then + fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel +fi Inform "fetch corefx packages" fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel Inform "Initialize standard unified" -fetch_tizen_pkgs_init standard Tizen-Unified +fetch_tizen_pkgs_init standard $UNIFIED Inform "fetch corefx packages" fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 0998e875e5..38e96724f5 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/13.1.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/13.1.0") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/13.1.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -80,6 +80,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64") set(TOOLCHAIN "riscv64-alpine-linux-musl") else() set(TOOLCHAIN "riscv64-linux-gnu") + if(TIZEN) + set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0") + endif() endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") set(CMAKE_SYSTEM_PROCESSOR s390x) @@ -95,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -112,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") @@ -144,6 +147,10 @@ if(TIZEN) include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu) endif() + if(TARGET_ARCH_NAME STREQUAL "riscv64") + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu) + endif() endif() if(ANDROID) @@ -270,7 +277,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") endif() -elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$") +elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$") if(TIZEN) add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 91f8196cc8..73828dd30d 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e20ee3a983..0b01531357 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -154,7 +154,7 @@ jobs: displayName: RichCodeNav Upload inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} - environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 84cfe7cd9c..fdd0cbb91f 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1 - $defaultXCopyMSBuildVersion = '17.7.2-1' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2 + $defaultXCopyMSBuildVersion = '17.8.1-2' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 293a6862f7..174b674cb9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rc.1.23455.8", + "dotnet": "8.0.100-rtm.23506.1", "runtimes": { "dotnet": [ "3.1.7", @@ -13,11 +13,11 @@ "xcopy-msbuild": "16.10.0-preview2" }, "sdk": { - "version": "8.0.100-rc.1.23455.8", + "version": "8.0.100-rtm.23506.1", "allowPrerelease": true, "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23516.5" } } From 2de746accc3d8b5867fd0ba87bc2c053122975a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 10:01:31 +0000 Subject: [PATCH 14/37] Update dependencies from https://github.com/dotnet/arcade build 20231017.7 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23517.7 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 528ab4ba00..3988332e01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23516.5"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23517.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>a672b7bba499394acf218dc59171e2d53e754237</Sha> + <Sha>7d8abd9dc3c87f248fc1e10aae8840b9dec0a861</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> @@ -27,9 +27,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>84a3d0e37e8f22b0b55f8bf932cb788b2bdd728f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23509.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> + <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23516.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Uri>https://github.com/dotnet/xliff-tasks</Uri> - <Sha>4f761bf529f4be49842b13d7efcef9af87f0a973</Sha> + <Sha>d66a09c8b11e1235273c8e6cd946e5c8e247f189</Sha> <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0"> diff --git a/global.json b/global.json index 174b674cb9..aaab92d32e 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23516.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23517.7" } } From 31547ac2867364382ac150e6bbc703fc1215c241 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 12:10:22 +0000 Subject: [PATCH 15/37] Update dependencies from https://github.com/dotnet/arcade build 20231017.7 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23517.7 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk From cd7dc652890a761cbdc363922cea6b6db0104524 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 12:08:54 +0000 Subject: [PATCH 16/37] Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3988332e01..50090dff2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23517.7"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23518.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>7d8abd9dc3c87f248fc1e10aae8840b9dec0a861</Sha> + <Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/global.json b/global.json index aaab92d32e..80a670a040 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23517.7" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2" } } From a13e00746c03e8d9b0b5866a19ef10b2df08c6a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 12:06:50 +0000 Subject: [PATCH 17/37] Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk From 8b19b819c02d45cd2f1b7872714876798b1c46da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Oct 2023 12:06:41 +0000 Subject: [PATCH 18/37] Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk From a0181e843ef66cc551bd207fcf8d2d5f44851c56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 22 Oct 2023 12:07:05 +0000 Subject: [PATCH 19/37] Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk From 6cebe875786c711b6bb8e6a7066be522fe880a38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 12:08:00 +0000 Subject: [PATCH 20/37] Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk From 91b59295dc9e09378187a889eac74daba91e0447 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 12:06:35 +0000 Subject: [PATCH 21/37] Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk From 5a3052c633037d1fe7359d02c0eaa54575eabac1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 12:08:38 +0000 Subject: [PATCH 22/37] Update dependencies from https://github.com/dotnet/arcade build 20231024.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23524.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/common/cross/toolchain.cmake | 10 +++++----- global.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50090dff2b..1adca5afeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23518.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23524.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha> + <Sha>3b9d8a14dfad67dc3a5c18734db967d3ad173537</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> @@ -27,9 +27,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>84a3d0e37e8f22b0b55f8bf932cb788b2bdd728f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23516.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> + <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23523.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Uri>https://github.com/dotnet/xliff-tasks</Uri> - <Sha>d66a09c8b11e1235273c8e6cd946e5c8e247f189</Sha> + <Sha>83531fff1a39abe38de53e2e6b702bc1bb9c3bb4</Sha> <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0"> diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 38e96724f5..00288a3006 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/13.1.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/13.1.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") diff --git a/global.json b/global.json index 80a670a040..a1b06defe7 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23524.1" } } From 86ca771a887a8c0609807c682c5e7930055b6275 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 12:09:28 +0000 Subject: [PATCH 23/37] Update dependencies from https://github.com/dotnet/arcade build 20231025.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23525.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1adca5afeb..3d556cfe60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23524.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23525.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>3b9d8a14dfad67dc3a5c18734db967d3ad173537</Sha> + <Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91f..e8def7e6a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -158,7 +158,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we do not need all ASP.NET packages restored. - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + $env:DOTNET_NOLOGO=1 # Disable telemetry on CI. if ($ci) { @@ -228,7 +228,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' - Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d4789433..710e64df96 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -112,7 +112,7 @@ function InitializeDotNetCli { export DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we want to control all package sources - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_NOLOGO=1 # Disable telemetry on CI if [[ $ci == true ]]; then @@ -165,7 +165,7 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" - Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" + Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value _InitializeDotNetCli="$dotnet_root" diff --git a/global.json b/global.json index a1b06defe7..0bbe71ba71 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23524.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23525.2" } } From 8b7f910cef11fa8c7b6eee6bb642ea15b4f47b8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:08:02 +0000 Subject: [PATCH 24/37] Update dependencies from https://github.com/dotnet/arcade build 20231027.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23527.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23525.5 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d556cfe60..d5274e7b4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23525.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23527.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha> + <Sha>30d512ae84149b306b6c160ed83dc433fc9f9cae</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> @@ -27,9 +27,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>84a3d0e37e8f22b0b55f8bf932cb788b2bdd728f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23523.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> + <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23525.5" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Uri>https://github.com/dotnet/xliff-tasks</Uri> - <Sha>83531fff1a39abe38de53e2e6b702bc1bb9c3bb4</Sha> + <Sha>0140d3d4a520d602a0721422eb656b78f16b5fba</Sha> <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0"> diff --git a/global.json b/global.json index 0bbe71ba71..2fa14fdd21 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23525.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23527.1" } } From e5ba30287013889f8505d5c353eee7fed805e701 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 20:19:19 +0000 Subject: [PATCH 25/37] Update dependencies from https://github.com/dotnet/arcade build 20231027.3 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23527.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5274e7b4b..1e4c6b9632 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23527.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23527.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>30d512ae84149b306b6c160ed83dc433fc9f9cae</Sha> + <Sha>41cd1b7f72df41c8598a3be11d0dafbf98d4bc16</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/global.json b/global.json index 2fa14fdd21..0223b2ab6a 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23527.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23527.3" } } From f405501f7221b3ceba740441b0a39238a5e0afef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Oct 2023 12:07:03 +0000 Subject: [PATCH 26/37] Update dependencies from https://github.com/dotnet/arcade build 20231027.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23527.4 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e4c6b9632..2f42352f17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23527.3"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23527.4"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>41cd1b7f72df41c8598a3be11d0dafbf98d4bc16</Sha> + <Sha>b2827fe94e3dd11be213dedacd6a57ace65d7522</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/global.json b/global.json index 0223b2ab6a..af2d9e0fc5 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23527.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23527.4" } } From 4a7661a838a595b27427e4231fb04efe45fed8d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 29 Oct 2023 07:00:42 +0000 Subject: [PATCH 27/37] Update dependencies from https://github.com/dotnet/arcade build 20231028.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23528.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f42352f17..7bd9517085 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23527.4"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23528.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>b2827fe94e3dd11be213dedacd6a57ace65d7522</Sha> + <Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/global.json b/global.json index af2d9e0fc5..70c9937208 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23527.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23528.2" } } From 597404139472b4abe5da38e22fc21772e5e170fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 29 Oct 2023 12:06:34 +0000 Subject: [PATCH 28/37] Update dependencies from https://github.com/dotnet/arcade build 20231028.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23528.2 From 4e4ea41889adedad7a67536a87e96cd791e61276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com> Date: Mon, 30 Oct 2023 08:37:13 +0100 Subject: [PATCH 29/37] Fix xliff tasks --- eng/Version.Details.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bd9517085..5cf8aa5016 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,10 +27,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>84a3d0e37e8f22b0b55f8bf932cb788b2bdd728f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23525.5" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> - <Uri>https://github.com/dotnet/xliff-tasks</Uri> - <Sha>0140d3d4a520d602a0721422eb656b78f16b5fba</Sha> - <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" /> + <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23528.1"> + <Uri>https://github.com/dotnet/arcade</Uri> + <Sha>a4d49646dbac90883d3672f1c08134d84cca5707</Sha> </Dependency> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0"> <Uri>https://github.com/dotnet/roslyn</Uri> From b132a3d451605c249168ce01d62155bab2b1df4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 12:06:38 +0000 Subject: [PATCH 30/37] Update dependencies from https://github.com/dotnet/arcade build 20231028.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23528.2 From 130384b719f2974e8e241b7cb89b645b1b0f1bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com> Date: Mon, 30 Oct 2023 16:27:20 +0100 Subject: [PATCH 31/37] Fix analyzer warning --- .../Tests/RulesetToEditorconfigConverterTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverterTests.cs b/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverterTests.cs index beddca113a..a3065aa7db 100644 --- a/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverterTests.cs +++ b/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverterTests.cs @@ -35,7 +35,7 @@ private static void Verify(string rulesetText, string expectedEditorconfigText, if (!Equals(expectedEditorconfigText, actualEditorConfigText)) { // Dump the entire expected and actual lines for easy update to baseline. - Assert.True(false, $"Expected:\r\n{expectedEditorconfigText}\r\n\r\nActual:\r\n{actualEditorConfigText}"); + Assert.Fail($"Expected:\r\n{expectedEditorconfigText}\r\n\r\nActual:\r\n{actualEditorConfigText}"); } } finally From c1ff73273c513ae71104cdea1ec8f44c31d7a929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com> Date: Mon, 30 Oct 2023 17:23:07 +0100 Subject: [PATCH 32/37] Update VS version This should fix the issue error NETSDK1213: (NETCORE_ENGINEERING_TELEMETRY=Build) Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 70c9937208..811daf70cb 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ ] }, "vs": { - "version": "16.10" + "version": "17.7.0" }, - "xcopy-msbuild": "16.10.0-preview2" + "xcopy-msbuild": "17.8.1-2" }, "sdk": { "version": "8.0.100-rtm.23506.1", From 685caba3beae15f3d0002de0950f24080678c1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com> Date: Mon, 30 Oct 2023 20:04:11 +0100 Subject: [PATCH 33/37] Use preview machine for public CI --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5318c19ce5..56e5d1acc6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,7 +34,7 @@ jobs: _codeCoverage: False pool: name: NetCore-Public - demands: ImageOverride -equals windows.vs2022.amd64.open + demands: ImageOverride -equals windows.vs2022preview.amd64.open timeoutInMinutes: 120 steps: From 33929726bfd50bbdd8c0587d1f39be6662241dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Mon, 30 Oct 2023 14:34:52 -0600 Subject: [PATCH 34/37] Downgrade global.json tools->dotnet to 8.0.100-rc.2.23502.2 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 811daf70cb..2999e2ee98 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rtm.23506.1", + "dotnet": "8.0.100-rc.2.23502.2", "runtimes": { "dotnet": [ "3.1.7", From 5f972bf121e6c8f5c6c062fb129e19dc87946c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com> Date: Tue, 31 Oct 2023 10:53:54 +0100 Subject: [PATCH 35/37] More revert --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 2999e2ee98..e227fc122d 100644 --- a/global.json +++ b/global.json @@ -10,10 +10,10 @@ "vs": { "version": "17.7.0" }, - "xcopy-msbuild": "17.8.1-2" + "xcopy-msbuild": "17.7.4" }, "sdk": { - "version": "8.0.100-rtm.23506.1", + "version": "8.0.100-rc.2.23502.2", "allowPrerelease": true, "rollForward": "patch" }, From 85b6c01db3cf4765507297b7298b8879aa52146b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 12:08:07 +0000 Subject: [PATCH 36/37] Update dependencies from https://github.com/dotnet/arcade build 20231031.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23531.1 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cf8aa5016..56d0d2bff5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,9 +17,9 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23528.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23531.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha> + <Sha>0ebe09a5ce6665a5fe1df1c644d4f77189c4deba</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> <!-- Used in repo tooling. Not updated automatically --> diff --git a/global.json b/global.json index e227fc122d..9ae550a748 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rc.2.23502.2", + "dotnet": "8.0.100-rtm.23506.1", "runtimes": { "dotnet": [ "3.1.7", @@ -13,11 +13,11 @@ "xcopy-msbuild": "17.7.4" }, "sdk": { - "version": "8.0.100-rc.2.23502.2", + "version": "8.0.100-rtm.23506.1", "allowPrerelease": true, "rollForward": "patch" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23528.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23531.1" } } From 9cf7d38874b8cabb1e6b299858e49082ec6ee6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com> Date: Tue, 31 Oct 2023 14:04:03 +0100 Subject: [PATCH 37/37] Revert again to 8.0.100-rc.2.23502.2 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 9ae550a748..6cda39cade 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rtm.23506.1", + "dotnet": "8.0.100-rc.2.23502.2", "runtimes": { "dotnet": [ "3.1.7", @@ -13,7 +13,7 @@ "xcopy-msbuild": "17.7.4" }, "sdk": { - "version": "8.0.100-rtm.23506.1", + "version": "8.0.100-rc.2.23502.2", "allowPrerelease": true, "rollForward": "patch" },