Skip to content

Commit 9d5facb

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx
2 parents 4113612 + 8dcf823 commit 9d5facb

File tree

13 files changed

+104
-115
lines changed

13 files changed

+104
-115
lines changed

‎.vsts-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ stages:
238238
_TestArg: ''
239239
Build_Linux_musl_Debug_x64:
240240
_BuildConfig: Debug
241-
_DockerParameter: '--docker alpine.3.13'
241+
_DockerParameter: '--docker alpine.3.15'
242242
_LinuxPortable: ''
243243
_RuntimeIdentifier: '--runtime-id linux-musl-x64'
244244
_BuildArchitecture: 'x64'
@@ -283,7 +283,7 @@ stages:
283283
_TestArg: ''
284284
Build_Linux_musl_Release_x64:
285285
_BuildConfig: Release
286-
_DockerParameter: '--docker alpine.3.13'
286+
_DockerParameter: '--docker alpine.3.15'
287287
_LinuxPortable: ''
288288
_RuntimeIdentifier: '--runtime-id linux-musl-x64'
289289
_BuildArchitecture: 'x64'

‎NuGet.config‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-aspnetcore -->
1010
<add key="darc-int-dotnet-aspnetcore-773e8cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-773e8cc3/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-aspnetcore-773e8cc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-773e8cc3-2/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-aspnetcore-773e8cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-773e8cc3-1/nuget/v3/index.json" />
1113
<!-- End: Package sources from dotnet-aspnetcore -->
1214
<!-- Begin: Package sources from dotnet-emsdk -->
1315
<!-- End: Package sources from dotnet-emsdk -->
1416
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1517
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1618
<!-- Begin: Package sources from dotnet-runtime -->
17-
<add key="darc-int-dotnet-runtime-0ec02c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0ec02c8c/nuget/v3/index.json" />
1819
<!-- End: Package sources from dotnet-runtime -->
1920
<!-- Begin: Package sources from dotnet-templating -->
20-
<add key="darc-int-dotnet-templating-416d9a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-416d9a7a/nuget/v3/index.json" />
2121
<!-- End: Package sources from dotnet-templating -->
2222
<!-- Begin: Package sources from dotnet-windowsdesktop -->
23-
<add key="darc-int-dotnet-windowsdesktop-657c81c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-657c81c5/nuget/v3/index.json" />
2423
<!-- End: Package sources from dotnet-windowsdesktop -->
2524
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2625
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -39,15 +38,14 @@
3938
<disabledPackageSources>
4039
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4140
<!-- Begin: Package sources from dotnet-aspnetcore -->
41+
<add key="darc-int-dotnet-aspnetcore-773e8cc-1" value="true" />
42+
<add key="darc-int-dotnet-aspnetcore-773e8cc-2" value="true" />
4243
<add key="darc-int-dotnet-aspnetcore-773e8cc" value="true" />
4344
<!-- End: Package sources from dotnet-aspnetcore -->
4445
<!-- Begin: Package sources from dotnet-runtime -->
45-
<add key="darc-int-dotnet-runtime-0ec02c8" value="true" />
4646
<!-- Begin: Package sources from dotnet-templating -->
47-
<add key="darc-int-dotnet-templating-416d9a7" value="true" />
4847
<!-- End: Package sources from dotnet-templating -->
4948
<!-- Begin: Package sources from dotnet-windowsdesktop -->
50-
<add key="darc-int-dotnet-windowsdesktop-657c81c" value="true" />
5149
<!-- End: Package sources from dotnet-windowsdesktop -->
5250
<!-- End: Package sources from dotnet-runtime -->
5351
<!-- Begin: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -90,27 +90,27 @@
9090
<Sha>9388790ba9ed8fef11584b2c74fe6789782a1592</Sha>
9191
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.302" CoherentParentDependency="Microsoft.NET.Sdk">
94-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
95-
<Sha>416d9a7ab914340b357cff31bf49ba7e708f5a41</Sha>
93+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.400-preview.22358.2" CoherentParentDependency="Microsoft.NET.Sdk">
94+
<Uri>https://github.com/dotnet/templating</Uri>
95+
<Sha>d8d193bf161de2a50a251035e4f9df2e2e85d7e7</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.302-servicing.22323.9" CoherentParentDependency="Microsoft.NET.Sdk">
98-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
99-
<Sha>416d9a7ab914340b357cff31bf49ba7e708f5a41</Sha>
97+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.400-preview.22358.2" CoherentParentDependency="Microsoft.NET.Sdk">
98+
<Uri>https://github.com/dotnet/templating</Uri>
99+
<Sha>d8d193bf161de2a50a251035e4f9df2e2e85d7e7</Sha>
100100
<SourceBuild RepoName="templating" ManagedOnly="true" />
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.302" CoherentParentDependency="Microsoft.NET.Sdk">
103-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
104-
<Sha>416d9a7ab914340b357cff31bf49ba7e708f5a41</Sha>
102+
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.400-preview.22358.2" CoherentParentDependency="Microsoft.NET.Sdk">
103+
<Uri>https://github.com/dotnet/templating</Uri>
104+
<Sha>d8d193bf161de2a50a251035e4f9df2e2e85d7e7</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.302-servicing.22323.12">
107-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
108-
<Sha>dc262f0c444d57181e580d4d5b9a517ea558c64a</Sha>
106+
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.400-preview.22364.3">
107+
<Uri>https://github.com/dotnet/sdk</Uri>
108+
<Sha>4445b8be251722225295d23ad8c7607b294ba353</Sha>
109109
<SourceBuild RepoName="sdk" ManagedOnly="true" />
110110
</Dependency>
111-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.302-servicing.22323.12">
112-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
113-
<Sha>dc262f0c444d57181e580d4d5b9a517ea558c64a</Sha>
111+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.400-preview.22364.3">
112+
<Uri>https://github.com/dotnet/sdk</Uri>
113+
<Sha>4445b8be251722225295d23ad8c7607b294ba353</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.7-servicing.22322.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -121,18 +121,18 @@
121121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
122122
<Sha>5063a17b211e70ca0ff6fed1b57e9d04727c25a8</Sha>
123123
</Dependency>
124-
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22274.4" CoherentParentDependency="Microsoft.NET.Sdk">
124+
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22363.4" CoherentParentDependency="Microsoft.NET.Sdk">
125125
<Uri>https://github.com/dotnet/fsharp</Uri>
126-
<Sha>211fd760c2315d73cfa0d375fe64abb346bc1096</Sha>
126+
<Sha>1b94f89d4d1f41f20f9be73c76f4b229d4e49078</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22274.4" CoherentParentDependency="Microsoft.NET.Sdk">
128+
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22363.4" CoherentParentDependency="Microsoft.NET.Sdk">
129129
<Uri>https://github.com/dotnet/fsharp</Uri>
130-
<Sha>211fd760c2315d73cfa0d375fe64abb346bc1096</Sha>
130+
<Sha>1b94f89d4d1f41f20f9be73c76f4b229d4e49078</Sha>
131131
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
132132
</Dependency>
133-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.2.0-release-20220408-11" CoherentParentDependency="Microsoft.NET.Sdk">
133+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.3.0-release-20220708-01" CoherentParentDependency="Microsoft.NET.Sdk">
134134
<Uri>https://github.com/microsoft/vstest</Uri>
135-
<Sha>717d0cf94925e9cf67466dbee46c1019930eb212</Sha>
135+
<Sha>c7ba2ca721808f830482ace6be06ae93077e0e7b</Sha>
136136
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
137137
</Dependency>
138138
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22219.3" CoherentParentDependency="Microsoft.NET.Sdk">
@@ -141,19 +141,19 @@
141141
<SourceBuild RepoName="linker" ManagedOnly="true" />
142142
<RepoName>linker</RepoName>
143143
</Dependency>
144-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.2.0-4.22220.5" CoherentParentDependency="Microsoft.NET.Sdk">
144+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.3.0-3.22363.19" CoherentParentDependency="Microsoft.NET.Sdk">
145145
<Uri>https://github.com/dotnet/roslyn</Uri>
146-
<Sha>432d17a83aa5623e4581756f4d642997048056bd</Sha>
146+
<Sha>8b86c2058266c6069e71705623fe9f3b26b648cf</Sha>
147147
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
148148
</Dependency>
149-
<Dependency Name="Microsoft.Build" Version="17.2.0" CoherentParentDependency="Microsoft.NET.Sdk">
149+
<Dependency Name="Microsoft.Build" Version="17.3.0-preview-22330-02" CoherentParentDependency="Microsoft.NET.Sdk">
150150
<Uri>https://github.com/dotnet/msbuild</Uri>
151-
<Sha>41abc5629965e3f9e41f1e67fdf78345c0c5cc4b</Sha>
151+
<Sha>77c72dd0f1758e994cf2ebd2ddd6d1ada695d261</Sha>
152152
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
153153
</Dependency>
154-
<Dependency Name="NuGet.Build.Tasks" Version="6.2.1-rc.7" CoherentParentDependency="Microsoft.NET.Sdk">
154+
<Dependency Name="NuGet.Build.Tasks" Version="6.3.0-rc.128" CoherentParentDependency="Microsoft.NET.Sdk">
155155
<Uri>https://github.com/nuget/nuget.client</Uri>
156-
<Sha>4be14ee6b6587a02f05337505bd840fbcbe898f6</Sha>
156+
<Sha>222ff7a5329be15520034b76fa1a84098d2ae9fd</Sha>
157157
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
158158
</Dependency>
159159
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
@@ -211,9 +211,9 @@
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212212
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
213213
</Dependency>
214-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22314.1">
214+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22363.1">
215215
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
216-
<Sha>bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b</Sha>
216+
<Sha>08e4967761f81c4c40b6872a0e639b4f588b4f00</Sha>
217217
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
218218
</Dependency>
219219
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

‎eng/Versions.props‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<PropertyGroup>
88
<VersionMajor>6</VersionMajor>
99
<VersionMinor>0</VersionMinor>
10-
<VersionSDKMinor>3</VersionSDKMinor>
11-
<VersionFeature>04</VersionFeature>
10+
<VersionSDKMinor>4</VersionSDKMinor>
11+
<VersionFeature>01</VersionFeature>
1212
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
1313
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1414
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
@@ -31,7 +31,7 @@
3131
</PropertyGroup>
3232
<PropertyGroup>
3333
<!-- Dependency from https://github.com/dotnet/templating -->
34-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.302</MicrosoftDotNetCommonItemTemplatesPackageVersion>
34+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.400-preview.22358.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
3535
</PropertyGroup>
3636
<PropertyGroup>
3737
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -56,8 +56,8 @@
5656
</PropertyGroup>
5757
<PropertyGroup>
5858
<!-- Dependencies from https://github.com/dotnet/sdk -->
59-
<MicrosoftNETSdkPackageVersion>6.0.302-servicing.22323.12</MicrosoftNETSdkPackageVersion>
60-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.302-servicing.22323.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
59+
<MicrosoftNETSdkPackageVersion>6.0.400-preview.22364.3</MicrosoftNETSdkPackageVersion>
60+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.400-preview.22364.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
6161
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
6262
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
6363
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -115,7 +115,7 @@
115115
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
116116
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
117117
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
118-
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.302</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
118+
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.400-preview.22358.2</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
119119
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
120120
<!-- 5.0 Template versions -->
121121
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftWinFormsProjectTemplates50PackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>
@@ -152,7 +152,7 @@
152152
<PropertyGroup>
153153
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
154154
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
155-
<MicrosoftNETTestSdkVersion>17.2.0-release-20220408-11</MicrosoftNETTestSdkVersion>
155+
<MicrosoftNETTestSdkVersion>17.3.0-release-20220708-01</MicrosoftNETTestSdkVersion>
156156
</PropertyGroup>
157157
<!-- dependencies for source-build tarball -->
158158
<PropertyGroup>
@@ -178,13 +178,13 @@
178178
</PropertyGroup>
179179
<!-- Workload manifest package versions -->
180180
<PropertyGroup>
181-
<MauiWorkloadManifestVersion>6.0.300-rc.1.5355</MauiWorkloadManifestVersion>
182-
<XamarinAndroidWorkloadManifestVersion>32.0.300-rc.1.4</XamarinAndroidWorkloadManifestVersion>
183-
<XamarinIOSWorkloadManifestVersion>15.4.100-rc.1.125</XamarinIOSWorkloadManifestVersion>
184-
<XamarinMacCatalystWorkloadManifestVersion>15.4.100-rc.1.125</XamarinMacCatalystWorkloadManifestVersion>
185-
<XamarinMacOSWorkloadManifestVersion>12.3.100-rc.1.125</XamarinMacOSWorkloadManifestVersion>
186-
<XamarinTvOSWorkloadManifestVersion>15.4.100-rc.1.125</XamarinTvOSWorkloadManifestVersion>
187-
<MonoWorkloadManifestVersion>6.0.4</MonoWorkloadManifestVersion>
181+
<MauiWorkloadManifestVersion>6.0.312</MauiWorkloadManifestVersion>
182+
<XamarinAndroidWorkloadManifestVersion>32.0.301</XamarinAndroidWorkloadManifestVersion>
183+
<XamarinIOSWorkloadManifestVersion>15.4.303</XamarinIOSWorkloadManifestVersion>
184+
<XamarinMacCatalystWorkloadManifestVersion>15.4.303</XamarinMacCatalystWorkloadManifestVersion>
185+
<XamarinMacOSWorkloadManifestVersion>12.3.303</XamarinMacOSWorkloadManifestVersion>
186+
<XamarinTvOSWorkloadManifestVersion>15.4.303</XamarinTvOSWorkloadManifestVersion>
187+
<MonoWorkloadManifestVersion>6.0.5</MonoWorkloadManifestVersion>
188188
<MicrosoftNETWorkloadEmscriptenManifest60200Version>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60200Version>
189189
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest60200Version)</EmscriptenWorkloadManifestVersion>
190190
</PropertyGroup>

‎eng/docker/alpine.3.13/Dockerfile‎ renamed to ‎eng/docker/alpine.3.15/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66
# Dockerfile that creates a container suitable to build dotnet-cli
7-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-20210714125444-ae5be29
7+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-20220610131707-f0ea7ba
88

99
RUN apk update && apk upgrade && apk add --no-cache curl ncurses
1010

‎src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch‎

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

‎src/SourceBuild/tarball/patches/nuget-client/0001-Pin-Microsoft.Build-and-Microsoft.Extensions.Command.patch‎

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

‎src/finalizer/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ target_link_libraries(Finalizer shell32.lib)
3131
target_link_libraries(Finalizer advapi32.lib)
3232
target_link_libraries(Finalizer version.lib)
3333
target_link_libraries(Finalizer msi.lib)
34-
target_link_libraries(Finalizer pathcch.lib)
3534

3635
# Add WiX libraries
3736
target_link_libraries(Finalizer wcautil.lib)

0 commit comments

Comments
 (0)