diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e6ad72ce29e95..f279abde7ea882 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness 769fd62b966f20a44d0800cdfeecb7d86e10f348 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 96098ac4ee8303ff32bfa4014cbd2f3a18e026eb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 5c97a5f3076091..c7ba7c9eb0f6c9 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.21270.3 + 6.0.0-beta.21270.3 + 6.0.0-beta.21270.3 + 6.0.0-beta.21270.3 + 6.0.0-beta.21270.3 + 6.0.0-beta.21270.3 + 2.5.1-beta.21270.3 + 6.0.0-beta.21270.3 + 6.0.0-beta.21270.3 + 6.0.0-beta.21270.3 + 6.0.0-beta.21270.3 + 6.0.0-beta.21270.3 + 6.0.0-beta.21270.3 5.9.0-preview.2 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 b772842dab0f18..04f1f01ac36808 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.21270.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21270.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21270.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21270.3", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21267.1"