Skip to content

Commit 70f8061

Browse files
Merge 3cfb3ea into pr-baseline-20240621110933
2 parents d5f7fdb + 3cfb3ea commit 70f8061

40 files changed

+314
-504
lines changed

eng/Version.Details.xml

Lines changed: 92 additions & 92 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
2323
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
2424
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
25-
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">6</PreReleaseVersionIteration>
25+
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">7</PreReleaseVersionIteration>
2626
<!-- In source-build the version of the compiler must be same or newer than the version of the
2727
compiler API targeted by analyzer assemblies. This is mostly an issue on source-build as
2828
in that build mode analyzer assemblies always target the live compiler API. -->
@@ -79,12 +79,12 @@
7979
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
8080
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
8181
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
82-
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.6.24319.11</SystemSecurityCryptographyProtectedDataPackageVersion>
82+
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.6.24323.2</SystemSecurityCryptographyProtectedDataPackageVersion>
8383
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
8484
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
8585
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
8686
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
87-
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.6.24319.11</SystemReflectionMetadataLoadContextVersion>
87+
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.6.24323.2</SystemReflectionMetadataLoadContextVersion>
8888
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
8989
<SystemCommandLineVersion>2.0.0-beta4.24209.3</SystemCommandLineVersion>
9090
<SystemCommandLineRenderingVersion>0.4.0-alpha.24209.3</SystemCommandLineRenderingVersion>
@@ -130,21 +130,21 @@
130130
</PropertyGroup>
131131
<PropertyGroup>
132132
<!-- Dependencies from https://github.com/dotnet/runtime -->
133-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETCoreAppRefPackageVersion>
134-
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24319.11</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
135-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
136-
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.6.24319.11</MicrosoftExtensionsDependencyModelPackageVersion>
137-
<MicrosoftNETHostModelVersion>9.0.0-preview.6.24319.11</MicrosoftNETHostModelVersion>
138-
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.6.24319.11</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
139-
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.6.24319.11</MicrosoftExtensionsLoggingAbstractionsVersion>
140-
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.6.24319.11</MicrosoftExtensionsLoggingConsoleVersion>
141-
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.6.24319.11</MicrosoftExtensionsLoggingVersion>
142-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETILLinkTasksPackageVersion>
143-
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.6.24319.11</SystemServiceProcessServiceControllerVersion>
133+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.6.24323.2</MicrosoftNETCoreAppRefPackageVersion>
134+
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.6.24323.2</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
135+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.6.24323.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
136+
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.6.24323.2</MicrosoftExtensionsDependencyModelPackageVersion>
137+
<MicrosoftNETHostModelVersion>9.0.0-preview.6.24323.2</MicrosoftNETHostModelVersion>
138+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.6.24323.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
139+
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.6.24323.2</MicrosoftExtensionsLoggingAbstractionsVersion>
140+
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.6.24323.2</MicrosoftExtensionsLoggingConsoleVersion>
141+
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.6.24323.2</MicrosoftExtensionsLoggingVersion>
142+
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.6.24323.2</MicrosoftNETILLinkTasksPackageVersion>
143+
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.6.24323.2</SystemServiceProcessServiceControllerVersion>
144144
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
145-
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETCorePlatformsPackageVersion>
146-
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.6.24319.11</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
147-
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETCoreAppHostwinx64PackageVersion>
145+
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.6.24323.2</MicrosoftNETCorePlatformsPackageVersion>
146+
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.6.24323.2</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
147+
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.6.24323.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
148148
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
149149
</PropertyGroup>
150150
<PropertyGroup>
@@ -177,9 +177,9 @@
177177
</PropertyGroup>
178178
<PropertyGroup>
179179
<!-- Dependencies from https://github.com/dotnet/runtime -->
180-
<SystemCodeDomPackageVersion>9.0.0-preview.6.24319.11</SystemCodeDomPackageVersion>
181-
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.6.24319.11</SystemTextEncodingCodePagesPackageVersion>
182-
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.6.24319.11</SystemResourcesExtensionsPackageVersion>
180+
<SystemCodeDomPackageVersion>9.0.0-preview.6.24323.2</SystemCodeDomPackageVersion>
181+
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.6.24323.2</SystemTextEncodingCodePagesPackageVersion>
182+
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.6.24323.2</SystemResourcesExtensionsPackageVersion>
183183
</PropertyGroup>
184184
<PropertyGroup>
185185
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
@@ -201,37 +201,37 @@
201201
then use that in Directory.Packages.props.
202202
203203
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
204-
<MicrosoftBuildVersion>17.11.0-preview-24318-05</MicrosoftBuildVersion>
205-
<MicrosoftBuildLocalizationVersion>17.11.0-preview-24318-05</MicrosoftBuildLocalizationVersion>
204+
<MicrosoftBuildVersion>17.12.0-preview-24321-01</MicrosoftBuildVersion>
205+
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24321-01</MicrosoftBuildLocalizationVersion>
206206
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
207207
</PropertyGroup>
208208
<PropertyGroup>
209209
<!-- Dependencies from https://github.com/dotnet/templating -->
210-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.6.24319.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
210+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.7.24323.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
211211
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
212212
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
213213
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
214214
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
215215
<!-- test dependencies -->
216-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.6.24319.1</MicrosoftTemplateEngineMocksPackageVersion>
216+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.7.24323.1</MicrosoftTemplateEngineMocksPackageVersion>
217217
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
218218
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
219219
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
220220
</PropertyGroup>
221221
<PropertyGroup>
222222
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
223-
<MicrosoftFSharpCompilerPackageVersion>12.8.400-beta.24318.2</MicrosoftFSharpCompilerPackageVersion>
223+
<MicrosoftFSharpCompilerPackageVersion>12.8.400-beta.24321.3</MicrosoftFSharpCompilerPackageVersion>
224224
</PropertyGroup>
225225
<PropertyGroup>
226226
<!-- Dependencies from https://github.com/dotnet/roslyn -->
227-
<MicrosoftNetCompilersToolsetVersion>4.11.0-3.24319.7</MicrosoftNetCompilersToolsetVersion>
228-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.11.0-3.24319.7</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
229-
<MicrosoftCodeAnalysisPackageVersion>4.11.0-3.24319.7</MicrosoftCodeAnalysisPackageVersion>
230-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.11.0-3.24319.7</MicrosoftCodeAnalysisCSharpPackageVersion>
231-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.11.0-3.24319.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
232-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.11.0-3.24319.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
233-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.11.0-3.24319.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
234-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.11.0-3.24319.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
227+
<MicrosoftNetCompilersToolsetVersion>4.11.0-3.24321.9</MicrosoftNetCompilersToolsetVersion>
228+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.11.0-3.24321.9</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
229+
<MicrosoftCodeAnalysisPackageVersion>4.11.0-3.24321.9</MicrosoftCodeAnalysisPackageVersion>
230+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.11.0-3.24321.9</MicrosoftCodeAnalysisCSharpPackageVersion>
231+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.11.0-3.24321.9</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
232+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.11.0-3.24321.9</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
233+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.11.0-3.24321.9</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
234+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.11.0-3.24321.9</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -302,10 +302,10 @@
302302
</PropertyGroup>
303303
<PropertyGroup>
304304
<!-- Dependencies from https://github.com/dotnet/arcade -->
305-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24317.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
306-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24317.3</MicrosoftDotNetSignToolVersion>
307-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24317.3</MicrosoftDotNetXliffTasksVersion>
308-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24317.3</MicrosoftDotNetXUnitExtensionsVersion>
305+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24321.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
306+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24321.4</MicrosoftDotNetSignToolVersion>
307+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24321.4</MicrosoftDotNetXliffTasksVersion>
308+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24321.4</MicrosoftDotNetXUnitExtensionsVersion>
309309
</PropertyGroup>
310310
<PropertyGroup>
311311
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
@@ -348,7 +348,7 @@
348348
<XamarinMacOSWorkloadManifestVersion>14.2.9088-net9-p1</XamarinMacOSWorkloadManifestVersion>
349349
<XamarinTvOSWorkloadManifestVersion>17.2.9088-net9-p1</XamarinTvOSWorkloadManifestVersion>
350350
<!-- Workloads from dotnet/emsdk -->
351-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.6.24317.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
351+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.7.24319.4</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
352352
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
353353
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
354354
<EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>

0 commit comments

Comments
 (0)