diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5e71f900433913..95b0ec61f11458 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21268.1", + "version": "1.0.0-prerelease.21271.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a910eb67683c1..621825389c1bde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,74 +1,74 @@ - + https://github.com/dotnet/icu - 39013b42331e508a2fd4752a3336285ba35cb82f + 207094bcc62a9235861af5e5a6f322f2039e71c6 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 https://github.com/microsoft/vstest @@ -178,17 +178,17 @@ https://github.com/mono/linker a621b9a630950026f5508c8089a59c0e825bd6e0 - + https://github.com/dotnet/xharness - 769fd62b966f20a44d0800cdfeecb7d86e10f348 + 98970876f4d21e6da5198a5c41de51ab1101089f - + https://github.com/dotnet/xharness - 769fd62b966f20a44d0800cdfeecb7d86e10f348 + 98970876f4d21e6da5198a5c41de51ab1101089f - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -210,9 +210,9 @@ https://github.com/dotnet/emsdk 8c4c21d02d68241859c7c26d33316ca5c5091092 - + https://github.com/dotnet/hotreload-utils - 53cf59cd8a221289d1d138ac6a8097ea457e4252 + 6a82938e7b952f014a08816e871e06741feabb14 diff --git a/eng/Versions.props b/eng/Versions.props index f78583f8d51aaa..3318405f17e629 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 2.5.1-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 2.5.1-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 5.9.0-preview.2 @@ -148,9 +148,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21268.1 - 1.0.0-prerelease.21268.1 - 1.0.1-alpha.0.21267.1 + 1.0.0-prerelease.21271.1 + 1.0.0-prerelease.21271.1 + 1.0.1-alpha.0.21270.1 2.4.1 2.4.2 1.3.0 @@ -163,7 +163,7 @@ 6.0.100-preview.5.21267.3 - 6.0.0-preview.5.21267.1 + 6.0.0-preview.6.21268.1 9.0.1-alpha.1.21267.1 9.0.1-alpha.1.21267.1 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 24c00b5be98b01..de348a2e225c08 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -14,7 +14,7 @@ $ErrorActionPreference = "Stop" Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') -$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json" +$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" $exclusions = @{ Exclusions = @() } if (Test-Path -Path $exclusionsFilePath) { @@ -92,14 +92,14 @@ Write-Host "LocProject.json generated:`n`n$json`n`n" Pop-Location if (!$UseCheckedInLocProjectJson) { - New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\Localize\LocProject.json" $json + New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json } else { - New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json + New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json - if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) { + if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) { Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." exit 1 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 958db4064cf024..2acdd5256dd83c 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -53,7 +53,7 @@ jobs: env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) inputs: - locProj: Localize/LocProject.json + locProj: eng/Localize/LocProject.json outDir: $(Build.ArtifactStagingDirectory) lclSource: ${{ parameters.LclSource }} lclPackageId: ${{ parameters.LclPackageId }} @@ -79,7 +79,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish LocProject.json inputs: - PathtoPublish: '$(Build.SourcesDirectory)/Localize/' + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' PublishLocation: Container ArtifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/global.json b/global.json index e14e03eaa98a82..f9c89139743782 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21264.2", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21264.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21271.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21271.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21271.3", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21267.1"