Skip to content

Commit a432216

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'release/6.0.4xx' of https://github.com/dotnet/installer into merge/release/6.0.1xx-to-release/6.0.4xx
2 parents 99b5b93 + c7f172f commit a432216

File tree

54 files changed

+464
-1311
lines changed

Some content is hidden

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

54 files changed

+464
-1311
lines changed

‎.vsts-ci.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ variables:
3636
value: ''
3737
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
3838
- name: _InternalRuntimeDownloadArgs
39-
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
39+
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
4040
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
4141
/p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
4242
- name: DncEngPublicBuildPool
@@ -272,7 +272,7 @@ extends:
272272
_TestArg: ''
273273
Build_Linux_musl_Debug_x64:
274274
_BuildConfig: Debug
275-
_DockerParameter: '--docker alpine.3.13'
275+
_DockerParameter: '--docker alpine.3.15'
276276
_LinuxPortable: ''
277277
_RuntimeIdentifier: '--runtime-id linux-musl-x64'
278278
_BuildArchitecture: 'x64'
@@ -317,7 +317,7 @@ extends:
317317
_TestArg: ''
318318
Build_Linux_musl_Release_x64:
319319
_BuildConfig: Release
320-
_DockerParameter: '--docker alpine.3.13'
320+
_DockerParameter: '--docker alpine.3.15'
321321
_LinuxPortable: ''
322322
_RuntimeIdentifier: '--runtime-id linux-musl-x64'
323323
_BuildArchitecture: 'x64'
@@ -415,11 +415,6 @@ extends:
415415

416416
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml@self
417417

418-
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
419-
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml@self
420-
parameters:
421-
dependsOn: Source_Build_Create_Tarball
422-
423418
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
424419
- template: /eng/common/templates-official/job/publish-build-assets.yml@self
425420
parameters:
@@ -429,6 +424,8 @@ extends:
429424
- Darwin
430425
- Source_Build_Managed
431426
- Source_Build_Create_Tarball
427+
- PGO_Linux
428+
- PGO_Windows_NT
432429
publishUsingPipelines: true
433430
pool:
434431
name: $(DncEngInternalBuildPool)

‎.vsts-pr.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ variables:
3434
value: ''
3535
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
3636
- name: _InternalRuntimeDownloadArgs
37-
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
37+
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
3838
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
3939
/p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
4040

@@ -228,7 +228,7 @@ stages:
228228
_TestArg: ''
229229
Build_Linux_musl_Debug_x64:
230230
_BuildConfig: Debug
231-
_DockerParameter: '--docker alpine.3.13'
231+
_DockerParameter: '--docker alpine.3.15'
232232
_LinuxPortable: ''
233233
_RuntimeIdentifier: '--runtime-id linux-musl-x64'
234234
_BuildArchitecture: 'x64'
@@ -273,7 +273,7 @@ stages:
273273
_TestArg: ''
274274
Build_Linux_musl_Release_x64:
275275
_BuildConfig: Release
276-
_DockerParameter: '--docker alpine.3.13'
276+
_DockerParameter: '--docker alpine.3.15'
277277
_LinuxPortable: ''
278278
_RuntimeIdentifier: '--runtime-id linux-musl-x64'
279279
_BuildArchitecture: 'x64'
@@ -367,11 +367,6 @@ stages:
367367

368368
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball-pr.yml
369369

370-
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
371-
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml
372-
parameters:
373-
dependsOn: Source_Build_Create_Tarball
374-
375370
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
376371
- template: /eng/common/templates/job/publish-build-assets.yml
377372
parameters:
@@ -381,6 +376,8 @@ stages:
381376
- Darwin
382377
- Source_Build_Managed
383378
- Source_Build_Create_Tarball
379+
- PGO_Linux
380+
- PGO_Windows_NT
384381
publishUsingPipelines: true
385382
pool:
386383
${{ if eq(variables['System.TeamProject'], 'internal') }}:

‎NuGet.config

+6-8
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
<add key="darc-pub-dotnet-emsdk-8601068" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-86010681/nuget/v3/index.json" />
1414
<!-- End: Package sources from dotnet-emsdk -->
1515
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
16-
<add key="darc-pub-DotNet-msbuild-Trusted-d679d20" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d679d209/nuget/v3/index.json" />
16+
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
1717
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1818
<!-- Begin: Package sources from dotnet-runtime -->
1919
<add key="darc-int-dotnet-runtime-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
2020
<!-- End: Package sources from dotnet-runtime -->
2121
<!-- Begin: Package sources from dotnet-templating -->
22-
<add key="darc-int-dotnet-templating-c86b755" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-templating-89f5155" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-89f5155b/nuget/v3/index.json" />
2323
<!-- End: Package sources from dotnet-templating -->
2424
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2525
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef2ca68f/nuget/v3/index.json" />
@@ -37,25 +37,23 @@
3737
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
3838
<!-- Temporary feed for Xamarin workload manifest -->
3939
<add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
40-
<!-- Remove after RTM. Working around lack of automated creation of isolated feeds for nuget client -->
41-
<add key="darc-pub-nuget-nuget.client-078701b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-nuget-nuget.client-078701b/nuget/v3/index.json" />
4240
</packageSources>
4341
<disabledPackageSources>
4442
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
45-
<!-- Begin: Package sources from dotnet-aspnetcore -->
46-
<add key="darc-int-dotnet-aspnetcore-fedc545" value="true" />
4743
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
4844
<!-- End: Package sources from DotNet-msbuild-Trusted -->
45+
<!-- Begin: Package sources from dotnet-aspnetcore -->
46+
<add key="darc-int-dotnet-aspnetcore-fedc545" value="true" />
4947
<!-- End: Package sources from dotnet-aspnetcore -->
5048
<!-- Begin: Package sources from dotnet-runtime -->
5149
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
50+
<!-- End: Package sources from dotnet-runtime -->
5251
<!-- Begin: Package sources from dotnet-templating -->
53-
<add key="darc-int-dotnet-templating-c86b755" value="true" />
52+
<add key="darc-int-dotnet-templating-89f5155" value="true" />
5453
<!-- End: Package sources from dotnet-templating -->
5554
<!-- Begin: Package sources from dotnet-windowsdesktop -->
5655
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" value="true" />
5756
<!-- End: Package sources from dotnet-windowsdesktop -->
58-
<!-- End: Package sources from dotnet-runtime -->
5957
<!-- Begin: Package sources from dotnet-windowsdesktop -->
6058
<!-- End: Package sources from dotnet-windowsdesktop -->
6159
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

+35-35
Original file line numberDiff line numberDiff line change
@@ -77,40 +77,40 @@
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
7878
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
80+
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22207.1">
8181
<Uri>https://github.com/dotnet/test-templates</Uri>
82-
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
82+
<Sha>9388790ba9ed8fef11584b2c74fe6789782a1592</Sha>
8383
</Dependency>
84-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.22064.3">
84+
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.22207.1">
8585
<Uri>https://github.com/dotnet/test-templates</Uri>
86-
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
86+
<Sha>9388790ba9ed8fef11584b2c74fe6789782a1592</Sha>
8787
</Dependency>
88-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.22064.3">
88+
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.22207.1">
8989
<Uri>https://github.com/dotnet/test-templates</Uri>
90-
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
90+
<Sha>9388790ba9ed8fef11584b2c74fe6789782a1592</Sha>
9191
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.132" CoherentParentDependency="Microsoft.NET.Sdk">
93+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.424" CoherentParentDependency="Microsoft.NET.Sdk">
9494
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
95-
<Sha>c86b7556cbdc3e9a5a5226547490713e2e948401</Sha>
95+
<Sha>89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.132-servicing.24314.6" CoherentParentDependency="Microsoft.NET.Sdk">
97+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.424-rtm.24314.8" CoherentParentDependency="Microsoft.NET.Sdk">
9898
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
99-
<Sha>c86b7556cbdc3e9a5a5226547490713e2e948401</Sha>
99+
<Sha>89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc</Sha>
100100
<SourceBuild RepoName="templating" ManagedOnly="true" />
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.132" CoherentParentDependency="Microsoft.NET.Sdk">
102+
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.424" CoherentParentDependency="Microsoft.NET.Sdk">
103103
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
104-
<Sha>c86b7556cbdc3e9a5a5226547490713e2e948401</Sha>
104+
<Sha>89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.132-servicing.24315.1">
106+
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.424-servicing.24315.2">
107107
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
108-
<Sha>53a7fb7b59ad63d09ce5182e2baaac1bd978f5d9</Sha>
108+
<Sha>d1ba1897fb2799cf7a51bab3492c933a4fdad702</Sha>
109109
<SourceBuild RepoName="sdk" ManagedOnly="true" />
110110
</Dependency>
111-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.132-servicing.24315.1">
111+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.424-servicing.24315.2">
112112
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
113-
<Sha>53a7fb7b59ad63d09ce5182e2baaac1bd978f5d9</Sha>
113+
<Sha>d1ba1897fb2799cf7a51bab3492c933a4fdad702</Sha>
114114
</Dependency>
115115
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
116116
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.32-servicing.24314.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -121,58 +121,58 @@
121121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
122122
<Sha>798cc6d4922db482f84fb72a8244f0da898bc5d6</Sha>
123123
</Dependency>
124-
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
124+
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.5-beta.22513.8" CoherentParentDependency="Microsoft.NET.Sdk">
125125
<Uri>https://github.com/dotnet/fsharp</Uri>
126-
<Sha>6d626ff0752a77d339f609b4d361787dc9ca93a5</Sha>
126+
<Sha>5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.1-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
128+
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.7-beta.22513.8" CoherentParentDependency="Microsoft.NET.Sdk">
129129
<Uri>https://github.com/dotnet/fsharp</Uri>
130-
<Sha>6d626ff0752a77d339f609b4d361787dc9ca93a5</Sha>
130+
<Sha>5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc</Sha>
131131
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
132132
</Dependency>
133-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.3-release-20230412-05" CoherentParentDependency="Microsoft.NET.Sdk">
133+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.3.3-release-20230405-02" CoherentParentDependency="Microsoft.NET.Sdk">
134134
<Uri>https://github.com/microsoft/vstest</Uri>
135-
<Sha>cc7fb0593127e24f55ce016fb3ac85b5b2857fec</Sha>
135+
<Sha>6e76d580fcc69954441344175bd1b0ab2e432026</Sha>
136136
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
137137
</Dependency>
138-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.NET.Sdk">
138+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.24270.5" CoherentParentDependency="Microsoft.NET.Sdk">
139139
<Uri>https://github.com/dotnet/linker</Uri>
140-
<Sha>d0662ed8db919642177ddfd06a1c33895a69015f</Sha>
140+
<Sha>e66cbcaa36aa719936a46160198c9012c6e174e4</Sha>
141141
<SourceBuild RepoName="linker" ManagedOnly="true" />
142142
<RepoName>linker</RepoName>
143143
</Dependency>
144-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.1-1.22181.2" CoherentParentDependency="Microsoft.NET.Sdk">
144+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.3.1-3.22526.13" CoherentParentDependency="Microsoft.NET.Sdk">
145145
<Uri>https://github.com/dotnet/roslyn</Uri>
146-
<Sha>487283bcd8d66693091f2800dcf1c8ae37cccdee</Sha>
146+
<Sha>41a5af9d2c459a06c0795bf21a1c046200f375bf</Sha>
147147
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
148148
</Dependency>
149-
<Dependency Name="Microsoft.Build" Version="17.0.3" CoherentParentDependency="Microsoft.NET.Sdk">
149+
<Dependency Name="Microsoft.Build" Version="17.3.4" CoherentParentDependency="Microsoft.NET.Sdk">
150150
<Uri>https://github.com/dotnet/msbuild</Uri>
151-
<Sha>d679d209277a156cdc0963c993585ffa5744dc5f</Sha>
151+
<Sha>a400405ba8c43976eda92a70d4adf72f9d292a22</Sha>
152152
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
153153
</Dependency>
154-
<Dependency Name="NuGet.Build.Tasks" Version="6.0.6-rc.4" CoherentParentDependency="Microsoft.NET.Sdk">
154+
<Dependency Name="NuGet.Build.Tasks" Version="6.3.4-rc.2" CoherentParentDependency="Microsoft.NET.Sdk">
155155
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
156-
<Sha>451e9bc27184dc49d04e975122c9e7189d525872</Sha>
156+
<Sha>5ec7c4dd0086f968a8bc5a20d5cc77b1454469f3</Sha>
157157
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
158158
</Dependency>
159-
<Dependency Name="Microsoft.ApplicationInsights" Version="2.19.0">
159+
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
160160
<Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
161-
<Sha>93f745cfef8541f09862aae9bc8c04554bca38c7</Sha>
161+
<Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
162162
</Dependency>
163163
<!-- Temporarily pinning Microsoft.Web.Xdt until strict coherency is enabled by default -->
164164
<Dependency Name="Microsoft.Web.Xdt" Version="5.0.0-preview.21431.1" CoherentParentDependency="Microsoft.NET.Sdk" Pinned="true">
165165
<Uri>https://github.com/dotnet/xdt</Uri>
166166
<Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
167167
<SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
168168
</Dependency>
169-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.32" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
169+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.32" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
170170
<Uri>https://github.com/dotnet/emsdk</Uri>
171171
<Sha>8601068126449af799f8e07ca358dbbd4b3fcab4</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="6.0.0-servicing.22419.2">
173+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21519.2" CoherentParentDependency="Microsoft.NET.Sdk">
174174
<Uri>https://github.com/dotnet/source-build</Uri>
175-
<Sha>7649ca7106e7e91ac06f169626bf01a77c2258eb</Sha>
175+
<Sha>10d0f7e94aa45889155c312f51cfc01bf326b853</Sha>
176176
<SourceBuild RepoName="source-build" ManagedOnly="true" />
177177
</Dependency>
178178
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.21310.2">

0 commit comments

Comments
 (0)