Skip to content

Commit b52099f

Browse files
marcpopMSFTmarcpopMSFT
committed
Merged PR 36643: Merge the public 8.0.2xx into internal/release/8.0.2xx
1 parent 1be930b commit b52099f

File tree

3 files changed

+97
-20
lines changed

3 files changed

+97
-20
lines changed

‎Directory.Packages.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageVersion Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)" />
1010
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion)" />
1111
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
12-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
12+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)"/>
1313
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
1414
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
1515
<PackageVersion Include="Microsoft.Build.Localization" Version="$(MicrosoftBuildLocalizationPackageVersion)" />
@@ -32,12 +32,12 @@
3232
<PackageVersion Include="Microsoft.DotNet.Installer.Windows.Security.TestData" Version="$(MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion)" />
3333
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
3434
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
35-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
35+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
3636
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
3737
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
3838
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
3939
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
40-
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
40+
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
4141
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
4242
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
4343
<PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
@@ -55,8 +55,8 @@
5555
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
5656
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
5757
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
58-
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
5958
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" />
59+
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
6060
<PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
6161
<PackageVersion Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
6262
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
@@ -82,27 +82,27 @@
8282
<PackageVersion Include="System.Collections.Specialized" Version="$(SystemCollectionsSpecializedPackageVersion)" />
8383
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
8484
<PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
85-
<PackageVersion Include="System.Composition.AttributedModel" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
86-
<PackageVersion Include="System.Composition.Convention" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
87-
<PackageVersion Include="System.Composition.Hosting" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
88-
<PackageVersion Include="System.Composition.Runtime" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
89-
<PackageVersion Include="System.Composition.TypedParts" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
90-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
91-
<PackageVersion Include="System.Drawing.Common" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
85+
<PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)"/>
86+
<PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)"/>
87+
<PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)"/>
88+
<PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)"/>
89+
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)"/>
90+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
91+
<PackageVersion Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" />
9292
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
9393
<!-- System.Reflection.Metadata and System.Collections.Immutable cannot be pinned here because of hard dependencies within Roslyn on specific versions that have to work both here and in VS -->
9494
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="$(SystemReflectionMetadataLoadContextVersion)" />
9595
<PackageVersion Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsPackageVersion)" />
9696
<PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
97-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
97+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" />
9898
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="$(SystemSecurityCryptographyProtectedDataPackageVersion)" />
9999
<PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
100-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
101-
<PackageVersion Include="System.Security.Permissions" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
100+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
101+
<PackageVersion Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
102102
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerVersion)" />
103103
<PackageVersion Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" />
104-
<PackageVersion Include="System.Text.Json" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
105-
<PackageVersion Include="System.Windows.Extensions" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
104+
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonPackageVersion)" />
105+
<PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
106106
<PackageVersion Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" />
107107
<PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.1" />
108108
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />

‎eng/Version.Details.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,70 @@
409409
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
410410
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
411411
</Dependency>
412+
<Dependency Name="System.Text.Json" Version="8.0.2">
413+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
414+
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
415+
</Dependency>
416+
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0">
417+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
418+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
419+
</Dependency>
420+
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="8.0.0">
421+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
422+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
423+
</Dependency>
424+
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.2">
425+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
426+
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
427+
</Dependency>
428+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0">
429+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
430+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
431+
</Dependency>
432+
<Dependency Name="System.Composition.AttributedModel" Version="8.0.0">
433+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
434+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
435+
</Dependency>
436+
<Dependency Name="System.Composition.Convention" Version="8.0.0">
437+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
438+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
439+
</Dependency>
440+
<Dependency Name="System.Composition.Hosting" Version="8.0.0">
441+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
442+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
443+
</Dependency>
444+
<Dependency Name="System.Composition.Runtime" Version="8.0.0">
445+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
446+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
447+
</Dependency>
448+
<Dependency Name="System.Composition.TypedParts" Version="8.0.0">
449+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
450+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
451+
</Dependency>
452+
<Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0">
453+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
454+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
455+
</Dependency>
456+
<Dependency Name="System.Drawing.Common" Version="8.0.1">
457+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
458+
<Sha>0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8</Sha>
459+
</Dependency>
460+
<Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.0">
461+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
462+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
463+
</Dependency>
464+
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0">
465+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
466+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
467+
</Dependency>
468+
<Dependency Name="System.Security.Permissions" Version="8.0.0">
469+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
470+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
471+
</Dependency>
472+
<Dependency Name="System.Windows.Extensions" Version="8.0.0">
473+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
474+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
475+
</Dependency>
412476
</ProductDependencies>
413477
<ToolsetDependencies>
414478
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24059.4">

‎eng/Versions.props‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<!-- Production Dependencies -->
2727
<PropertyGroup>
2828
<MicrosoftCssParserVersion>1.0.0-20230414.1</MicrosoftCssParserVersion>
29-
<MicrosoftExtensionsDependencyModelVersion>2.1.0-preview2-26306-03</MicrosoftExtensionsDependencyModelVersion>
3029
<MicrosoftApplicationInsightsPackageVersion>2.21.0</MicrosoftApplicationInsightsPackageVersion>
3130
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
3231
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
@@ -40,7 +39,6 @@
4039
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
4140
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
4241
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
43-
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
4442
<SystemReflectionMetadataLoadContextVersion>8.0.0</SystemReflectionMetadataLoadContextVersion>
4543
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
4644
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
@@ -59,11 +57,27 @@
5957
<MicrosoftNETHostModelVersion>8.0.2-servicing.24067.11</MicrosoftNETHostModelVersion>
6058
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
6159
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
60+
<MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
6261
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
6362
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>
64-
<MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
6563
<MicrosoftNETILLinkTasksPackageVersion>8.0.2</MicrosoftNETILLinkTasksPackageVersion>
64+
<MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
65+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
66+
<MicrosoftExtensionsObjectPoolPackageVersion>8.0.2</MicrosoftExtensionsObjectPoolPackageVersion>
67+
<MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion>
68+
<SystemCompositionAttributedModelPackageVersion>8.0.0</SystemCompositionAttributedModelPackageVersion>
69+
<SystemCompositionConventionPackageVersion>8.0.0</SystemCompositionConventionPackageVersion>
70+
<SystemCompositionHostingPackageVersion>8.0.0</SystemCompositionHostingPackageVersion>
71+
<SystemCompositionRuntimePackageVersion>8.0.0</SystemCompositionRuntimePackageVersion>
72+
<SystemCompositionTypedPartsPackageVersion>8.0.0</SystemCompositionTypedPartsPackageVersion>
73+
<SystemConfigurationConfigurationManagerPackageVersion>8.0.0</SystemConfigurationConfigurationManagerPackageVersion>
74+
<SystemDrawingCommonPackageVersion>8.0.1</SystemDrawingCommonPackageVersion>
75+
<SystemSecurityCryptographyPkcsPackageVersion>8.0.0</SystemSecurityCryptographyPkcsPackageVersion>
76+
<SystemSecurityCryptographyXmlPackageVersion>8.0.0</SystemSecurityCryptographyXmlPackageVersion>
77+
<SystemSecurityPermissionsPackageVersion>8.0.0</SystemSecurityPermissionsPackageVersion>
6678
<SystemServiceProcessServiceControllerVersion>8.0.0</SystemServiceProcessServiceControllerVersion>
79+
<SystemTextJsonPackageVersion>8.0.2</SystemTextJsonPackageVersion>
80+
<SystemWindowsExtensionsPackageVersion>8.0.0</SystemWindowsExtensionsPackageVersion>
6781
</PropertyGroup>
6882
<PropertyGroup>
6983
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -210,7 +224,6 @@
210224
</PropertyGroup>
211225
<PropertyGroup>
212226
<!-- Workloads from dotnet/emsdk -->
213-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
214227
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
215228
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)</EmscriptenWorkloadManifestVersion>
216229
<!-- emsdk workload prerelease version band must match the emsdk feature band -->

0 commit comments

Comments
 (0)