Skip to content

Commit a2de2d8

Browse files
marcpopMSFTmarcpopMSFT
authored
Fix 15 packages to track their own versions through darc (#41890)
2 parents 0e34227 + daf0615 commit a2de2d8

File tree

3 files changed

+90
-15
lines changed

3 files changed

+90
-15
lines changed

‎Directory.Packages.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageVersion Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)" />
1313
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion)" />
1414
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
15-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
15+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesPackageVersion)"/>
1616
<PackageVersion Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
1717
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
1818
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingVersion)" />
@@ -37,12 +37,12 @@
3737
<PackageVersion Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
3838
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
3939
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
40-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
40+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
4141
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
4242
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
4343
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
4444
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
45-
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
45+
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
4646
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
4747
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
4848
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
@@ -68,7 +68,7 @@
6868
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
6969
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7070
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
71-
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
71+
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
7272
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" />
7373
<PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
7474
<PackageVersion Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
@@ -95,26 +95,26 @@
9595
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
9696
<PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
9797
<PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
98-
<PackageVersion Include="System.Composition.AttributedModel" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
99-
<PackageVersion Include="System.Composition.Convention" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
100-
<PackageVersion Include="System.Composition.Hosting" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
101-
<PackageVersion Include="System.Composition.Runtime" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
102-
<PackageVersion Include="System.Composition.TypedParts" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
103-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
98+
<PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)"/>
99+
<PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)"/>
100+
<PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)"/>
101+
<PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)"/>
102+
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)"/>
103+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
104104
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
105105
<!-- 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 -->
106106
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="$(SystemReflectionMetadataLoadContextVersion)" />
107107
<PackageVersion Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsPackageVersion)" />
108108
<PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
109-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
109+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" />
110110
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="$(SystemSecurityCryptographyProtectedDataPackageVersion)" />
111111
<PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
112-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
113-
<PackageVersion Include="System.Security.Permissions" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
112+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
113+
<PackageVersion Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
114114
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerVersion)" />
115115
<PackageVersion Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" />
116-
<PackageVersion Include="System.Text.Json" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
117-
<PackageVersion Include="System.Windows.Extensions" Version="$(MicrosoftNETCoreAppRefPackageVersion)" />
116+
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonPackageVersion)" />
117+
<PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
118118
<PackageVersion Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" />
119119
<PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.1" />
120120
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />

‎eng/Version.Details.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,66 @@
519519
<Uri>https://github.com/dotnet/runtime</Uri>
520520
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
521521
</Dependency>
522+
<Dependency Name="System.Text.Json" Version="9.0.0-preview.7.24357.2">
523+
<Uri>https://github.com/dotnet/runtime</Uri>
524+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
525+
</Dependency>
526+
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0-preview.7.24357.2">
527+
<Uri>https://github.com/dotnet/runtime</Uri>
528+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
529+
</Dependency>
530+
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="9.0.0-preview.7.24357.2">
531+
<Uri>https://github.com/dotnet/runtime</Uri>
532+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
533+
</Dependency>
534+
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-preview.7.24357.1">
535+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
536+
<Sha>ebc0c700ce8f1f568bf6a26affa5ee88e664833e</Sha>
537+
</Dependency>
538+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="9.0.0-preview.7.24357.2">
539+
<Uri>https://github.com/dotnet/runtime</Uri>
540+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
541+
</Dependency>
542+
<Dependency Name="System.Composition.AttributedModel" Version="9.0.0-preview.7.24357.2">
543+
<Uri>https://github.com/dotnet/runtime</Uri>
544+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
545+
</Dependency>
546+
<Dependency Name="System.Composition.Convention" Version="9.0.0-preview.7.24357.2">
547+
<Uri>https://github.com/dotnet/runtime</Uri>
548+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
549+
</Dependency>
550+
<Dependency Name="System.Composition.Hosting" Version="9.0.0-preview.7.24357.2">
551+
<Uri>https://github.com/dotnet/runtime</Uri>
552+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
553+
</Dependency>
554+
<Dependency Name="System.Composition.Runtime" Version="9.0.0-preview.7.24357.2">
555+
<Uri>https://github.com/dotnet/runtime</Uri>
556+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
557+
</Dependency>
558+
<Dependency Name="System.Composition.TypedParts" Version="9.0.0-preview.7.24357.2">
559+
<Uri>https://github.com/dotnet/runtime</Uri>
560+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
561+
</Dependency>
562+
<Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0-preview.7.24357.2">
563+
<Uri>https://github.com/dotnet/runtime</Uri>
564+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
565+
</Dependency>
566+
<Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.0-preview.7.24357.2">
567+
<Uri>https://github.com/dotnet/runtime</Uri>
568+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
569+
</Dependency>
570+
<Dependency Name="System.Security.Cryptography.Xml" Version="9.0.0-preview.7.24357.2">
571+
<Uri>https://github.com/dotnet/runtime</Uri>
572+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
573+
</Dependency>
574+
<Dependency Name="System.Security.Permissions" Version="9.0.0-preview.7.24357.2">
575+
<Uri>https://github.com/dotnet/runtime</Uri>
576+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
577+
</Dependency>
578+
<Dependency Name="System.Windows.Extensions" Version="9.0.0-preview.7.24357.2">
579+
<Uri>https://github.com/dotnet/runtime</Uri>
580+
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
581+
</Dependency>
522582
</ProductDependencies>
523583
<ToolsetDependencies>
524584
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24352.2">

‎eng/Versions.props

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,20 @@
146146
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.7.24357.2</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
147147
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.7.24357.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
148148
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
149+
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0-preview.7.24357.2</MicrosoftBclAsyncInterfacesPackageVersion>
150+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>9.0.0-preview.7.24357.2</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
151+
<MicrosoftWin32SystemEventsPackageVersion>9.0.0-preview.7.24357.2</MicrosoftWin32SystemEventsPackageVersion>
152+
<SystemCompositionAttributedModelPackageVersion>9.0.0-preview.7.24357.2</SystemCompositionAttributedModelPackageVersion>
153+
<SystemCompositionConventionPackageVersion>9.0.0-preview.7.24357.2</SystemCompositionConventionPackageVersion>
154+
<SystemCompositionHostingPackageVersion>9.0.0-preview.7.24357.2</SystemCompositionHostingPackageVersion>
155+
<SystemCompositionRuntimePackageVersion>9.0.0-preview.7.24357.2</SystemCompositionRuntimePackageVersion>
156+
<SystemCompositionTypedPartsPackageVersion>9.0.0-preview.7.24357.2</SystemCompositionTypedPartsPackageVersion>
157+
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-preview.7.24357.2</SystemConfigurationConfigurationManagerPackageVersion>
158+
<SystemSecurityCryptographyPkcsPackageVersion>9.0.0-preview.7.24357.2</SystemSecurityCryptographyPkcsPackageVersion>
159+
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-preview.7.24357.2</SystemSecurityCryptographyXmlPackageVersion>
160+
<SystemSecurityPermissionsPackageVersion>9.0.0-preview.7.24357.2</SystemSecurityPermissionsPackageVersion>
161+
<SystemTextJsonPackageVersion>9.0.0-preview.7.24357.2</SystemTextJsonPackageVersion>
162+
<SystemWindowsExtensionsPackageVersion>9.0.0-preview.7.24357.2</SystemWindowsExtensionsPackageVersion>
149163
</PropertyGroup>
150164
<PropertyGroup>
151165
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
@@ -244,6 +258,7 @@
244258
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreTestHostPackageVersion>
245259
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
246260
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24357.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
261+
<MicrosoftExtensionsObjectPoolPackageVersion>9.0.0-preview.7.24357.1</MicrosoftExtensionsObjectPoolPackageVersion>
247262
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24357.1</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
248263
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24357.1</dotnetdevcertsPackageVersion>
249264
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24357.1</dotnetuserjwtsPackageVersion>

0 commit comments

Comments
 (0)