Skip to content

Commit 9b088ab

Browse files
carlossanlopcarlossanlop
authored
Merge pull request #101832 from carlossanlop/release/8.0-staging
[manual] Merge release/8.0-staging into release/8.0
2 parents 97bc9c4 + 783771d commit 9b088ab

119 files changed

Lines changed: 1817 additions & 927 deletions

File tree

Some content is hidden

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

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-71359b1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-71359b18/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-a1cd44f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a1cd44fd/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-sdk -->
1515
<!-- End: Package sources from dotnet-sdk -->

‎eng/Subsets.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@
504504
</ItemGroup>
505505
<ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(PgoInstrument)' != 'true'">
506506
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Host.sfxproj" />
507-
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
507+
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and '$(PgoInstrument)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
508508
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-host.proj" />
509509
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-hostfxr.proj" />
510510
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-runtime-deps\*.proj" />

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,23 @@
9090
<Sha>45dd3a73dd5b64b010c4251303b3664bb30df029</Sha>
9191
<SourceBuild RepoName="cecil" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.5">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.6">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>71359b18c2d83c01a68bf155244a65962a7e8c8e</Sha>
95+
<Sha>a1cd44fdc64aa1f1c4630ddcd95580800d229180</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.5-servicing.24211.3">
97+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.6-servicing.24252.3">
9898
<Uri>https://github.com/dotnet/emsdk</Uri>
99-
<Sha>71359b18c2d83c01a68bf155244a65962a7e8c8e</Sha>
99+
<Sha>a1cd44fdc64aa1f1c4630ddcd95580800d229180</Sha>
100100
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
101101
</Dependency>
102102
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24163.3">
103103
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
104104
<Sha>79827eed138fd2575a8b24820b4f385ee4ffb6e6</Sha>
105105
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
106106
</Dependency>
107-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24175.3">
107+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24216.1">
108108
<Uri>https://github.com/dotnet/source-build-externals</Uri>
109-
<Sha>300e99190e6ae1983681694dbdd5f75f0c692081</Sha>
109+
<Sha>908177a58a41532b3302c17f1e1a8cf1c1234545</Sha>
110110
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
111111
</Dependency>
112112
</ProductDependencies>
@@ -354,9 +354,9 @@
354354
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
355355
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
356356
</Dependency>
357-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24210.1">
357+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24229.2">
358358
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
359-
<Sha>85d6e21ac1d4e0977dfd1321131be0c912d70d80</Sha>
359+
<Sha>61f137aacabdbd8f279415287a2dd70e150f5eb1</Sha>
360360
</Dependency>
361361
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24211.2">
362362
<Uri>https://github.com/dotnet/runtime-assets</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<MinorVersion>0</MinorVersion>
88
<PatchVersion>6</PatchVersion>
99
<SdkBandVersion>8.0.100</SdkBandVersion>
10-
<PackageVersionNet7>7.0.$([MSBuild]::Add($(PatchVersion),14))</PackageVersionNet7>
11-
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11))</PackageVersionNet6>
10+
<PackageVersionNet7>7.0.19</PackageVersionNet7>
11+
<PackageVersionNet6>6.0.$([MSBuild]::Add($(PatchVersion),25))</PackageVersionNet6>
1212
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1313
<PreReleaseVersionIteration>
1414
</PreReleaseVersionIteration>
@@ -186,7 +186,7 @@
186186
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24208.4</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
187187
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24208.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
188188
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24208.4</MicrosoftDotNetXHarnessCLIVersion>
189-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24210.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
189+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24229.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
190190
<XUnitVersion>2.4.2</XUnitVersion>
191191
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
192192
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -240,7 +240,7 @@
240240
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
241241
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
242242
-->
243-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.5</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
243+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.6</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
244244
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
245245
<!-- workloads -->
246246
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

‎eng/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ usage()
3232
echo " [Default: Debug]"
3333
echo " --os Target operating system: windows, linux, freebsd, osx, maccatalyst, tvos,"
3434
echo " tvossimulator, ios, iossimulator, android, browser, wasi, netbsd, illumos, solaris"
35-
echo " linux-musl, linux-bionic or haiku."
35+
echo " linux-musl, linux-bionic, tizen, or haiku."
3636
echo " [Default: Your machine's OS.]"
3737
echo " --outputrid <rid> Optional argument that overrides the target rid name."
3838
echo " --projects <value> Project or solution file(s) to build."

‎eng/collect_vsinfo.ps1‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<#
2+
.PARAMETER ArchiveRunName
3+
Name of the run for vs logs
4+
5+
.NOTES
6+
Returns 0 if succeeds, 1 otherwise
7+
#>
8+
[CmdletBinding(PositionalBinding=$false)]
9+
Param (
10+
[Parameter(Mandatory=$True)]
11+
[string] $ArchiveRunName
12+
)
13+
14+
. $PSScriptRoot/common/tools.ps1
15+
16+
$ProgressPreference = "SilentlyContinue"
17+
$LogDir = Join-Path $LogDir $ArchiveRunName
18+
mkdir $LogDir
19+
20+
$vscollect_uri="http://aka.ms/vscollect.exe"
21+
$vscollect="$env:TEMP\vscollect.exe"
22+
23+
if (-not (Test-Path $vscollect)) {
24+
Retry({
25+
Write-Host "GET $vscollect_uri"
26+
Invoke-WebRequest $vscollect_uri -OutFile $vscollect -UseBasicParsing
27+
})
28+
29+
if (-not (Test-Path $vscollect)) {
30+
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download vscollect."
31+
exit 1
32+
}
33+
}
34+
35+
&"$vscollect"
36+
Move-Item $env:TEMP\vslogs.zip "$LogDir"
37+
38+
$vswhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
39+
if (-not (Test-Path -Path "$vswhere" -PathType Leaf))
40+
{
41+
Write-Error "Couldn't locate vswhere at $vswhere"
42+
exit 1
43+
}
44+
45+
&"$vswhere" -all -prerelease -products * | Tee-Object -FilePath "$LogDir\vs_where.log"
46+
47+
$vsdir = &"$vswhere" -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
48+
49+
if (-not (Test-Path $vsdir))
50+
{
51+
$procDumpDir = Join-Path $ToolsDir "procdump"
52+
$procDumpToolPath = Join-Path $procDumpDir "procdump.exe"
53+
$procdump_uri = "https://download.sysinternals.com/files/Procdump.zip"
54+
55+
if (-not (Test-Path $procDumpToolPath)) {
56+
Retry({
57+
Write-Host "GET $procdump_uri"
58+
Invoke-WebRequest $procdump_uri -OutFile "$TempDir\Procdump.zip" -UseBasicParsing
59+
})
60+
61+
Expand-Archive -Path "$TempDir\Procdump.zip" $procDumpDir
62+
}
63+
64+
&"$procDumpToolPath" -ma -accepteula VSIXAutoUpdate.exe "$LogDir"
65+
}

‎eng/disable_vsupdate.ps1‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
schtasks /change /tn "\Microsoft\VisualStudio\VSIX Auto Update" /disable
2+
3+
$vswhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
4+
if (-not (Test-Path -Path "$vswhere" -PathType Leaf))
5+
{
6+
Write-Error "Couldn't locate vswhere at $vswhere"
7+
exit 1
8+
}
9+
10+
$vsdir = &"$vswhere" -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
11+
$vsregedit = "$vsdir\Common7\IDE\VsRegEdit.exe"
12+
13+
if (-not (Test-Path -Path "$vsregedit" ))
14+
{
15+
Write-Error "VSWhere returned path: $vsdir, but regedit $vsregedit doesn't exist."
16+
exit 1
17+
}
18+
19+
Write-Output "VSWhere returned path: $vsdir, using regedit $vsregedit"
20+
Write-Output "Disabling updates through VS Registry:"
21+
22+
&"$vsdir\Common7\IDE\VsRegEdit.exe" set local HKCU ExtensionManager AutomaticallyCheckForUpdates2Override dword 0
23+
&"$vsdir\Common7\IDE\VsRegEdit.exe" read local HKCU ExtensionManager AutomaticallyCheckForUpdates2Override dword

‎eng/empty.csproj‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎eng/native/init-vs-env.cmd‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ if defined VisualStudioVersion goto :VSDetected
2626
set "__VSWhere=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
2727
set "__VSCOMNTOOLS="
2828

29+
if not exist "%__VSWhere%" goto :VSWhereMissing
30+
2931
if exist "%__VSWhere%" (
3032
for /f "tokens=*" %%p in (
3133
'"%__VSWhere%" -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath'
@@ -56,6 +58,10 @@ echo %__MsgPrefix%Error: Visual Studio 2022 with C++ tools required. ^
5658
Please see https://github.com/dotnet/runtime/blob/main/docs/workflow/requirements/windows-requirements.md for build requirements.
5759
exit /b 1
5860

61+
:VSWhereMissing
62+
echo %__MsgPrefix%Error: vswhere couldn not be found in Visual Studio Installer directory at "%__VSWhere%"
63+
exit /b 1
64+
5965
:SetVCEnvironment
6066

6167
if "%__VCBuildArch%"=="" exit /b 0

‎eng/pipelines/common/global-build-job.yml‎

Lines changed: 53 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ parameters:
1414
dependsOn: []
1515
pool: ''
1616
platform: ''
17-
pgoType: ''
1817
condition: true
1918
useContinueOnErrorDuringBuild: false
2019
shouldContinueOnError: false
@@ -27,8 +26,7 @@ parameters:
2726
helixQueues: ''
2827
enablePublishTestResults: false
2928
testResultsFormat: ''
30-
extraStepsTemplate: ''
31-
extraStepsParameters: {}
29+
postBuildSteps: []
3230
extraVariablesTemplates: []
3331
isManualCodeQLBuild: false
3432
preBuildSteps: []
@@ -134,7 +132,6 @@ jobs:
134132
targetRid: ${{ parameters.targetRid }}
135133
nameSuffix: ${{ parameters.nameSuffix }}
136134
platform: ${{ parameters.platform }}
137-
pgoType: ${{ parameters.pgoType }}
138135
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
139136
${{ if ne(variableTemplate.forwardedParameters, '') }}:
140137
${{ each parameter in variableTemplate.forwardedParameters }}:
@@ -211,7 +208,28 @@ jobs:
211208

212209
- ${{ if ne(parameters.preBuildSteps,'') }}:
213210
- ${{ each preBuildStep in parameters.preBuildSteps }}:
214-
- ${{ preBuildStep }}
211+
- ${{ if ne(preBuildStep.template, '') }}:
212+
- template: ${{ preBuildStep.template }}
213+
parameters:
214+
osGroup: ${{ parameters.osGroup }}
215+
osSubgroup: ${{ parameters.osSubgroup }}
216+
archType: ${{ parameters.archType }}
217+
buildConfig: ${{ parameters.buildConfig }}
218+
runtimeFlavor: ${{ parameters.runtimeFlavor }}
219+
runtimeVariant: ${{ parameters.runtimeVariant }}
220+
helixQueues: ${{ parameters.helixQueues }}
221+
targetRid: ${{ parameters.targetRid }}
222+
nameSuffix: ${{ parameters.nameSuffix }}
223+
platform: ${{ parameters.platform }}
224+
pgoType: ${{ parameters.pgoType }}
225+
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
226+
${{ if ne(preBuildStep.forwardedParameters, '') }}:
227+
${{ each parameter in preBuildStep.forwardedParameters }}:
228+
${{ parameter }}: ${{ parameters[parameter] }}
229+
${{ if ne(preBuildStep.parameters, '') }}:
230+
${{ insert }}: ${{ preBuildStep.parameters }}
231+
- ${{ else }}:
232+
- ${{ preBuildStep }}
215233

216234
# Build
217235
- ${{ if eq(parameters.isSourceBuild, false) }}:
@@ -237,31 +255,43 @@ jobs:
237255
condition: always()
238256
239257
# If intended to send extra steps after regular build add them here.
240-
- ${{ if ne(parameters.extraStepsTemplate, '') }}:
241-
- template: ${{ parameters.extraStepsTemplate }}
242-
parameters:
243-
osGroup: ${{ parameters.osGroup }}
244-
osSubgroup: ${{ parameters.osSubgroup }}
245-
archType: ${{ parameters.archType }}
246-
buildConfig: ${{ parameters.buildConfig }}
247-
runtimeFlavor: ${{ parameters.runtimeFlavor }}
248-
runtimeVariant: ${{ parameters.runtimeVariant }}
249-
helixQueues: ${{ parameters.helixQueues }}
250-
targetRid: ${{ parameters.targetRid }}
251-
nameSuffix: ${{ parameters.nameSuffix }}
252-
platform: ${{ parameters.platform }}
253-
pgoType: ${{ parameters.pgoType }}
254-
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
255-
${{ insert }}: ${{ parameters.extraStepsParameters }}
258+
- ${{ if ne(parameters.postBuildSteps,'') }}:
259+
- ${{ each postBuildStep in parameters.postBuildSteps }}:
260+
- ${{ if ne(postBuildStep.template, '') }}:
261+
- template: ${{ postBuildStep.template }}
262+
parameters:
263+
osGroup: ${{ parameters.osGroup }}
264+
osSubgroup: ${{ parameters.osSubgroup }}
265+
archType: ${{ parameters.archType }}
266+
buildConfig: ${{ parameters.buildConfig }}
267+
runtimeFlavor: ${{ parameters.runtimeFlavor }}
268+
runtimeVariant: ${{ parameters.runtimeVariant }}
269+
helixQueues: ${{ parameters.helixQueues }}
270+
targetRid: ${{ parameters.targetRid }}
271+
nameSuffix: ${{ parameters.nameSuffix }}
272+
platform: ${{ parameters.platform }}
273+
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
274+
${{ if ne(postBuildStep.forwardedParameters, '') }}:
275+
${{ each parameter in postBuildStep.forwardedParameters }}:
276+
${{ parameter }}: ${{ parameters[parameter] }}
277+
${{ if ne(postBuildStep.parameters, '') }}:
278+
${{ insert }}: ${{ postBuildStep.parameters }}
279+
- ${{ else }}:
280+
- ${{ postBuildStep }}
281+
282+
- ${{ if and(eq(parameters.isOfficialBuild, true), eq(parameters.osGroup, 'windows')) }}:
283+
- powershell: ./eng/collect_vsinfo.ps1 -ArchiveRunName postbuild_log
284+
displayName: Collect vslogs on exit
285+
condition: always()
256286

257287
- task: PublishBuildArtifacts@1
258288
displayName: Publish Logs
259289
inputs:
260290
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/'
261291
PublishLocation: Container
262292
${{ if notin(parameters.osGroup, 'browser', 'wasi') }}:
263-
ArtifactName: Logs_Build_${{ parameters.osGroup }}_${{ parameters.osSubGroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
293+
ArtifactName: Logs_Build_Attempt$(System.JobAttempt)_${{ parameters.osGroup }}_${{ parameters.osSubGroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
264294
${{ if in(parameters.osGroup, 'browser', 'wasi') }}:
265-
ArtifactName: Logs_Build_${{ parameters.osGroup }}_${{ parameters.archType }}_${{ parameters.hostedOs }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
295+
ArtifactName: Logs_Build_Attempt$(System.JobAttempt)_${{ parameters.osGroup }}_${{ parameters.archType }}_${{ parameters.hostedOs }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
266296
continueOnError: true
267297
condition: always()

0 commit comments

Comments
 (0)