diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index de1c51d3d000..32a87eba5847 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.24510.3", + "version": "9.0.0-prerelease.24517.2", "commands": [ "xharness" ] diff --git a/Directory.Build.props b/Directory.Build.props index 703c893553e4..7629600a56de 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -210,8 +210,8 @@ - $(RepoRoot)/temp/ - $(RepoRoot)/.dotnet/ + $(RepoRoot)temp/ + $(RepoRoot).dotnet/ $(DotNetDirectory)dotnet $(DotNetDirectory)packs/ $(DotNetDirectory)library-packs/ diff --git a/NuGet.config b/NuGet.config index b5f2d6cccedd..a11ea98ae26d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -15,25 +36,34 @@ - + + - + - + - + - - + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7377fcffd6df..2bdf70932e91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,185 +1,185 @@ - - https://github.com/dotnet/sdk - 0009da1479d71f7c69ba5ae8e4d0e91ef2f7e6eb + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 64233715764f78eb3c3796f97b335ffa39fa6816 - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - + https://github.com/dotnet/android - 594d0905db5b57f996c5fec0fbcef2a4723ea4ec + b90c55905de2f5703a8660952816cf3767b027a7 - + https://github.com/xamarin/xamarin-macios - 2f3ae2492519571ccf3f7280dfca232e42b5ada2 + a351bc9fa99af0406c7e1291ba565e232767c648 - + https://github.com/xamarin/xamarin-macios - 2f3ae2492519571ccf3f7280dfca232e42b5ada2 + a351bc9fa99af0406c7e1291ba565e232767c648 - + https://github.com/xamarin/xamarin-macios - 2f3ae2492519571ccf3f7280dfca232e42b5ada2 + a351bc9fa99af0406c7e1291ba565e232767c648 - + https://github.com/xamarin/xamarin-macios - 2f3ae2492519571ccf3f7280dfca232e42b5ada2 + a351bc9fa99af0406c7e1291ba565e232767c648 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal - + https://github.com/dotnet/emsdk - 8e660ff41e91879977e3a9d837e068bd72234c26 + 5054dd35a56010d8f6232408e56e31ad8ccc987a - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 - - https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 85435709e560642610e746831682cf4f8fe77c34 https://github.com/dotnet/templating 3f4da9ced34942d83054e647f3b1d9d7dde281e8 - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - - https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9c52987919f0223531191d4cfaa6487647bbf52c - + https://github.com/dotnet/xharness - 8c0dc6866c1b786baf476dd767323b24f102bee4 + 04b2cb0ca1470bfec4104cc6e0d75d24a363beca - + https://github.com/dotnet/xharness - 8c0dc6866c1b786baf476dd767323b24f102bee4 + 04b2cb0ca1470bfec4104cc6e0d75d24a363beca - + https://github.com/dotnet/xharness - 8c0dc6866c1b786baf476dd767323b24f102bee4 + 04b2cb0ca1470bfec4104cc6e0d75d24a363beca - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d diff --git a/eng/Versions.props b/eng/Versions.props index 89932a6407e9..8d91c678f696 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,8 @@ 0 9.0.100 rtm - + + true @@ -29,57 +30,57 @@ 8.0.82 - 9.0.100-rtm.24514.22 + 9.0.100-rtm.24522.3 $(MicrosoftNETSdkPackageVersion) - 9.0.0-rtm.24511.16 + 9.0.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 - 35.0.1-ci.main.44 + 35.0.1-rtm.61 - 18.0.9606-net9-rtm - 15.0.9606-net9-rtm - 18.0.9606-net9-rtm - 18.0.9606-net9-rtm + 18.0.9612 + 15.0.9612 + 18.0.9612 + 18.0.9612 8.0.148 - 9.0.0-rtm.24469.1 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) + 9.0.0 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) 1.6.240923002 10.0.22621.756 1.2.0 1.0.2792.45 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 8.0.7 $(MicrosoftAspNetCorePackageVersion) @@ -124,22 +125,22 @@ <_HarfBuzzSharpVersion>7.3.0.2 <_SkiaSharpNativeAssetsVersion>0.0.0-commit.7af1d0840a381c0ce7ef2877454a88dbb2949686.1086 7.0.114 - 9.0.0-prerelease.24510.3 - 9.0.0-prerelease.24510.3 - 9.0.0-prerelease.24510.3 + 9.0.0-prerelease.24517.2 + 9.0.0-prerelease.24517.2 + 9.0.0-prerelease.24517.2 0.9.2 1.0.0.16 1.3.0 0.9.0 4.2.3 8.0.3 - 9.0.0-beta.24509.3 - 9.0.0-beta.24509.3 - 9.0.0-beta.24509.3 - 9.0.0-beta.24509.3 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 1.1.87-gba258badda - 9.0.0-beta.24509.3 - 9.0.0-beta.24509.3 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 17.6.0 diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml index d2901470a7f0..9db5617ea7de 100644 --- a/eng/common/core-templates/steps/get-delegation-sas.yml +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -31,7 +31,16 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 1f29c6c8278d..364df8a9f659 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -62,8 +62,8 @@ variables: # Variable groups required for private builds - ${{ if or(eq(variables['System.TeamProject'], 'DevDiv'), eq(variables['Build.DefinitionName'], 'dotnet-maui')) }}: - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: - - name: PrivateBuild - value: false + - name: PRIVATE_BUILD + value: true - name: _RunAsPublic value: False - name: _RunAsInternal diff --git a/global.json b/global.json index d34c468d1c5c..2cf4732b01fd 100644 --- a/global.json +++ b/global.json @@ -5,7 +5,7 @@ "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2" }, "sdk": { "allowPrerelease": true diff --git a/src/DotNet/Dependencies/Workloads.csproj b/src/DotNet/Dependencies/Workloads.csproj index 1028d741d76d..2ddd9d93dec1 100644 --- a/src/DotNet/Dependencies/Workloads.csproj +++ b/src/DotNet/Dependencies/Workloads.csproj @@ -4,12 +4,12 @@ - - + - - + diff --git a/src/DotNet/DotNet.csproj b/src/DotNet/DotNet.csproj index a542ef8fd09f..fcc9cb73603d 100644 --- a/src/DotNet/DotNet.csproj +++ b/src/DotNet/DotNet.csproj @@ -8,7 +8,7 @@ https://dotnetbuilds.blob.core.windows.net/public $(MauiRootDirectory)/artifacts $(PRIVATE_BUILD) - false + true <_SkipUpgradeNetAnalyzersNuGetWarning>true <_SkipUpdateBuildNumber>true @@ -48,7 +48,7 @@ For a system install, you will need to run this in an admin command-prompt on Windows, or use 'sudo' on Mac. --> - +