Skip to content

Commit 37e3ee4

Browse files
jkotasjkotas
authored
Merge pull request #62850 from dotnet-maestro-bot/merge/release/6.0-to-release/6.0-maui
[automated] Merge branch 'release/6.0' => 'release/6.0-maui'
2 parents 2ab2de4 + d63fcb9 commit 37e3ee4

File tree

74 files changed

+1174
-395
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1174
-395
lines changed

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,77 +18,77 @@
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21560.2">
21+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21609.4">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
23+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21560.2">
25+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21609.4">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
27+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21560.2">
29+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21609.4">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
31+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21560.2">
33+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21609.4">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
35+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21560.2">
37+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21609.4">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
39+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21560.2">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21609.4">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
43+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21560.2">
45+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21609.4">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
47+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21560.2">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21609.4">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
51+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21560.2">
53+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21609.4">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
55+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21565.3">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21609.4">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>a35b36664af90a8e61f051ad06fb8039380b1526</Sha>
59+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21560.2">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21609.4">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
63+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21560.2">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21609.4">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
67+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21560.2">
69+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21609.4">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
71+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21560.2">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21609.4">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
75+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21560.2">
77+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21609.4">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
79+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21560.2">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21609.4">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
83+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21560.2">
85+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21609.4">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
87+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21560.2">
89+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21609.4">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
91+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
9292
</Dependency>
9393
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
9494
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -210,9 +210,9 @@
210210
<Uri>https://github.com/dotnet/xharness</Uri>
211211
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
212212
</Dependency>
213-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21560.2">
213+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21609.4">
214214
<Uri>https://github.com/dotnet/arcade</Uri>
215-
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
215+
<Sha>7421b55f46aff8373764016d942b23cbf87c75cb</Sha>
216216
</Dependency>
217217
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
218218
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<PropertyGroup>
33
<!-- The .NET product branding version -->
4-
<ProductVersion>6.0.1</ProductVersion>
4+
<ProductVersion>6.0.2</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>6</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>1</PatchVersion>
8+
<PatchVersion>2</PatchVersion>
99
<SdkBandVersion>6.0.100</SdkBandVersion>
1010
<PreReleaseVersionLabel>mauipre</PreReleaseVersionLabel>
1111
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
@@ -37,8 +37,8 @@
3737
manually enabled by updating the metadata.
3838
-->
3939
<ItemGroup>
40-
<!-- Targeting packs are only patched in extreme cases. -->
41-
<ProjectServicingConfiguration Include="Microsoft.NETCore.App.Ref" PatchVersion="1" />
40+
<!-- Targeting packs are only patched when we need to patch reference assemblies, intellisense, or source generators. -->
41+
<ProjectServicingConfiguration Include="Microsoft.NETCore.App.Ref" PatchVersion="2" />
4242
</ItemGroup>
4343
<PropertyGroup>
4444
<!-- For source generator support we need to target multiple versions of Rolsyn in order to be able to run on older versions of Roslyn -->
@@ -54,21 +54,21 @@
5454
<!-- SDK dependencies -->
5555
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
5656
<!-- Arcade dependencies -->
57-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21560.2</MicrosoftDotNetApiCompatVersion>
58-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksFeedVersion>
59-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21560.2</MicrosoftDotNetCodeAnalysisVersion>
60-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21560.2</MicrosoftDotNetGenAPIVersion>
61-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21560.2</MicrosoftDotNetGenFacadesVersion>
62-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21560.2</MicrosoftDotNetXUnitExtensionsVersion>
63-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21560.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
64-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksArchivesVersion>
65-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21565.3</MicrosoftDotNetBuildTasksInstallersVersion>
66-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksPackagingVersion>
67-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksTemplatingVersion>
68-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21560.2</MicrosoftDotNetRemoteExecutorVersion>
70-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21560.2</MicrosoftDotNetVersionToolsTasksVersion>
71-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21560.2</MicrosoftDotNetPackageTestingVersion>
57+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21609.4</MicrosoftDotNetApiCompatVersion>
58+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21609.4</MicrosoftDotNetBuildTasksFeedVersion>
59+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21609.4</MicrosoftDotNetCodeAnalysisVersion>
60+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21609.4</MicrosoftDotNetGenAPIVersion>
61+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21609.4</MicrosoftDotNetGenFacadesVersion>
62+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21609.4</MicrosoftDotNetXUnitExtensionsVersion>
63+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21609.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
64+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21609.4</MicrosoftDotNetBuildTasksArchivesVersion>
65+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21609.4</MicrosoftDotNetBuildTasksInstallersVersion>
66+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21609.4</MicrosoftDotNetBuildTasksPackagingVersion>
67+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21609.4</MicrosoftDotNetBuildTasksTemplatingVersion>
68+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21609.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21609.4</MicrosoftDotNetRemoteExecutorVersion>
70+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21609.4</MicrosoftDotNetVersionToolsTasksVersion>
71+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21609.4</MicrosoftDotNetPackageTestingVersion>
7272
<!-- NuGet dependencies -->
7373
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7474
<!-- Installer dependencies -->

‎eng/common/build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,6 @@ function InitializeCustomToolset {
188188

189189
function Build {
190190

191-
if [[ "$ci" == true ]]; then
192-
TryLogClientIpAddress
193-
fi
194191
InitializeToolset
195192
InitializeCustomToolset
196193

‎eng/common/sdk-task.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ try {
8383
}
8484

8585
if ($restore) {
86-
if ($ci) {
87-
Try-LogClientIpAddress
88-
}
8986
Build 'Restore'
9087
}
9188

‎eng/common/templates/job/onelocbuild.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ parameters:
1212
SourcesDirectory: $(Build.SourcesDirectory)
1313
CreatePr: true
1414
AutoCompletePr: false
15+
ReusePr: true
1516
UseLfLineEndings: true
1617
UseCheckedInLocProjectJson: false
1718
LanguageSet: VS_Main_Languages
@@ -64,6 +65,8 @@ jobs:
6465
${{ if eq(parameters.CreatePr, true) }}:
6566
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
6667
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
68+
${{ if eq(parameters.RepoType, 'gitHub') }}:
69+
isShouldReusePrSelected: ${{ parameters.ReusePr }}
6770
packageSourceAuth: patAuth
6871
patVariable: ${{ parameters.CeapexPat }}
6972
${{ if eq(parameters.RepoType, 'gitHub') }}:

‎eng/common/tools.ps1

Lines changed: 34 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
163163
# Disable telemetry on CI.
164164
if ($ci) {
165165
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
166-
167-
# In case of network error, try to log the current IP for reference
168-
Try-LogClientIpAddress
169166
}
170167

171168
# Source Build uses DotNetCoreSdkDir variable
@@ -301,32 +298,45 @@ function InstallDotNet([string] $dotnetRoot,
301298
if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles }
302299
if ($noPath) { $installParameters.NoPath = $True }
303300

304-
try {
305-
& $installScript @installParameters
306-
}
307-
catch {
308-
if ($runtimeSourceFeed -or $runtimeSourceFeedKey) {
309-
Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'"
310-
if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed }
301+
$variations = @()
302+
$variations += @($installParameters)
311303

312-
if ($runtimeSourceFeedKey) {
313-
$decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
314-
$decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
315-
$installParameters.FeedCredential = $decodedString
316-
}
304+
$dotnetBuilds = $installParameters.Clone()
305+
$dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
306+
$variations += @($dotnetBuilds)
317307

318-
try {
319-
& $installScript @installParameters
320-
}
321-
catch {
322-
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'."
323-
ExitWithExitCode 1
324-
}
308+
if ($runtimeSourceFeed) {
309+
$runtimeSource = $installParameters.Clone()
310+
$runtimeSource.AzureFeed = $runtimeSourceFeed
311+
if ($runtimeSourceFeedKey) {
312+
$decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
313+
$decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
314+
$runtimeSource.FeedCredential = $decodedString
315+
}
316+
$variations += @($runtimeSource)
317+
}
318+
319+
$installSuccess = $false
320+
foreach ($variation in $variations) {
321+
if ($variation | Get-Member AzureFeed) {
322+
$location = $variation.AzureFeed
325323
} else {
326-
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location."
327-
ExitWithExitCode 1
324+
$location = "public location";
325+
}
326+
Write-Host "Attempting to install dotnet from $location."
327+
try {
328+
& $installScript @variation
329+
$installSuccess = $true
330+
break
331+
}
332+
catch {
333+
Write-Host "Failed to install dotnet from $location."
328334
}
329335
}
336+
if (-not $installSuccess) {
337+
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations."
338+
ExitWithExitCode 1
339+
}
330340
}
331341

332342
#
@@ -882,24 +892,6 @@ if (!$disableConfigureToolsetImport) {
882892
}
883893
}
884894

885-
function Try-LogClientIpAddress()
886-
{
887-
Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
888-
try
889-
{
890-
$result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
891-
$lines = $result.Content.Split([Environment]::NewLine)
892-
$socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
893-
Write-Host $socketIp
894-
$clientIp = $lines | Select-String -Pattern "^Client IP:.*"
895-
Write-Host $clientIp
896-
}
897-
catch
898-
{
899-
Write-Host "Unable to get this machine's effective IP address for logging: $_"
900-
}
901-
}
902-
903895
#
904896
# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
905897
#

0 commit comments

Comments
 (0)