Skip to content
Draft
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/runtime dependencies -->
<SystemCodeDomPackageVersion>9.0.11</SystemCodeDomPackageVersion>
<SystemCollectionsImmutablePackageVersion>9.0.11</SystemCollectionsImmutablePackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>9.0.11</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>9.0.11</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>9.0.11</SystemDiagnosticsEventLogPackageVersion>
<SystemFormatsAsn1PackageVersion>9.0.11</SystemFormatsAsn1PackageVersion>
<SystemFormatsNrbfPackageVersion>9.0.11</SystemFormatsNrbfPackageVersion>
<SystemReflectionMetadataPackageVersion>9.0.11</SystemReflectionMetadataPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>9.0.11</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.11</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>9.0.11</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.11</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>9.0.11</SystemSecurityCryptographyXmlPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.11</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>9.0.11</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>9.0.11</SystemThreadingChannelsPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>9.0.11</SystemThreadingTasksDataflowPackageVersion>
<SystemCodeDomPackageVersion>10.0.0</SystemCodeDomPackageVersion>
<SystemCollectionsImmutablePackageVersion>10.0.0</SystemCollectionsImmutablePackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0</SystemFormatsAsn1PackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0</SystemFormatsNrbfPackageVersion>
<SystemReflectionMetadataPackageVersion>10.0.0</SystemReflectionMetadataPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0</SystemSecurityCryptographyXmlPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>10.0.0</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>10.0.0</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>10.0.0</SystemThreadingChannelsPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>10.0.0</SystemThreadingTasksDataflowPackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25605.3</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25605.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
Expand Down
34 changes: 17 additions & 17 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,103 +3,103 @@
<Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="5a69737e6f6447fe397d552503a3909ea49f6f34" BarId="293565" />
<ProductDependencies>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.CodeDom" Version="9.0.11">
<Dependency Name="System.CodeDom" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Collections.Immutable" Version="9.0.11">
<Dependency Name="System.Collections.Immutable" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.11">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.11">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Diagnostics.EventLog" Version="9.0.11">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Formats.Asn1" Version="9.0.11">
<Dependency Name="System.Formats.Asn1" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Formats.Nrbf" Version="9.0.11">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Reflection.Metadata" Version="9.0.11">
<Dependency Name="System.Reflection.Metadata" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.11">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Resources.Extensions" Version="9.0.11">
<Dependency Name="System.Resources.Extensions" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.11">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Security.Cryptography.Pkcs" Version="9.0.11">
<Dependency Name="System.Security.Cryptography.Pkcs" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Security.Cryptography.Xml" Version="9.0.11">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Text.Encoding.CodePages" Version="9.0.11">
<Dependency Name="System.Text.Encoding.CodePages" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Text.Json" Version="9.0.11">
<Dependency Name="System.Text.Json" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Threading.Channels" Version="9.0.11">
<Dependency Name="System.Threading.Channels" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Threading.Tasks.Dataflow" Version="9.0.11">
<Dependency Name="System.Threading.Tasks.Dataflow" Version="10.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
However, we can update, binding-redirect to, and distribute the newest version (that matches the VS-referenced versions) in order to get the benefits of updating.
See uses of $(UseFrozenMaintenancePackageVersions) for details.
-->
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingTasksExtensionsVersion>4.6.0</SystemThreadingTasksExtensionsVersion>
<SystemMemoryVersion>4.6.3</SystemMemoryVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.2</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingTasksExtensionsVersion>4.6.3</SystemThreadingTasksExtensionsVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down
20 changes: 10 additions & 10 deletions src/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@
<UseFrozenMaintenancePackageVersions Condition="'$(UseFrozenMaintenancePackageVersions)' == '' AND '$(IsUnitTestProject)' != 'true' AND $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net472')) AND '$(OutputType)' != 'exe'">true</UseFrozenMaintenancePackageVersions>

<FrozenMicrosoftIORedistVersion>6.0.1</FrozenMicrosoftIORedistVersion>
<FrozenSystemMemoryVersion>4.5.5</FrozenSystemMemoryVersion>
<FrozenSystemRuntimeCompilerServicesUnsafeVersion>6.0.0</FrozenSystemRuntimeCompilerServicesUnsafeVersion>
<FrozenSystemThreadingTasksExtensionsVersion>4.5.4</FrozenSystemThreadingTasksExtensionsVersion>
<FrozenSystemBuffersVersion>4.5.1</FrozenSystemBuffersVersion>
<FrozenSystemNumericsVectorsVersion>4.5.0</FrozenSystemNumericsVectorsVersion>
<FrozenSystemMemoryVersion>4.6.3</FrozenSystemMemoryVersion>
<FrozenSystemRuntimeCompilerServicesUnsafeVersion>6.1.2</FrozenSystemRuntimeCompilerServicesUnsafeVersion>
<FrozenSystemThreadingTasksExtensionsVersion>4.6.3</FrozenSystemThreadingTasksExtensionsVersion>
<FrozenSystemBuffersVersion>4.6.1</FrozenSystemBuffersVersion>
<FrozenSystemNumericsVectorsVersion>4.6.1</FrozenSystemNumericsVectorsVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot do not update these versions. They're frozen for important reasons.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted frozen versions in commit [pending]. However, the 10.0.0 runtime packages have incompatible dependency requirements:

  • System.Text.Json 10.0.0 → requires System.Memory 4.6.3 (frozen: 4.5.5)
  • System.Collections.Immutable 10.0.0 → requires System.Runtime.CompilerServices.Unsafe 6.1.2 (frozen: 6.0.0)

The build fails with assembly version conflicts. Should I:

  1. Revert the entire runtime package update to 9.0.11?
  2. Keep eng/Versions.props updates (4.6.3/6.1.2/4.6.3) without frozen version changes?
  3. Another approach?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep the eng/versions.props updates but do not change the frozen versions.

</PropertyGroup>

<ItemGroup Condition="'$(UseFrozenMaintenancePackageVersions)' == 'true'">
Expand All @@ -176,19 +176,19 @@
<Reference Include="$(NuGetPackageRoot)microsoft.io.redist\$(FrozenMicrosoftIORedistVersion)\lib\net472\Microsoft.IO.Redist.dll" />

<Reference Remove="@(Reference)" Condition="'%(Reference.NuGetPackageId)' == 'System.Buffers' and $([MSBuild]::VersionGreaterThan(%(Reference.NuGetPackageVersion), '$(FrozenSystemBuffersVersion)'))" />
<Reference Include="$(NuGetPackageRoot)system.buffers\$(FrozenSystemBuffersVersion)\lib\net461\System.Buffers.dll" />
<Reference Include="$(NuGetPackageRoot)system.buffers\$(FrozenSystemBuffersVersion)\lib\net462\System.Buffers.dll" />

<Reference Remove="@(Reference)" Condition="'%(Reference.NuGetPackageId)' == 'System.Memory' and $([MSBuild]::VersionGreaterThan(%(Reference.NuGetPackageVersion), '$(FrozenSystemMemoryVersion)'))" />
<Reference Include="$(NuGetPackageRoot)system.memory\$(FrozenSystemMemoryVersion)\lib\net461\System.Memory.dll" />
<Reference Include="$(NuGetPackageRoot)system.memory\$(FrozenSystemMemoryVersion)\lib\net462\System.Memory.dll" />

<Reference Remove="@(Reference)" Condition="'%(Reference.NuGetPackageId)' == 'System.Numerics.Vectors' and $([MSBuild]::VersionGreaterThan(%(Reference.NuGetPackageVersion), '$(FrozenSystemNumericsVectorsVersion)'))" />
<Reference Include="$(NuGetPackageRoot)system.numerics.vectors\$(FrozenSystemNumericsVectorsVersion)\lib\net46\System.Numerics.Vectors.dll" />
<Reference Include="$(NuGetPackageRoot)system.numerics.vectors\$(FrozenSystemNumericsVectorsVersion)\lib\net462\System.Numerics.Vectors.dll" />

<Reference Remove="@(Reference)" Condition="'%(Reference.NuGetPackageId)' == 'System.Runtime.CompilerServices.Unsafe' and $([MSBuild]::VersionGreaterThan(%(Reference.NuGetPackageVersion), '$(FrozenSystemRuntimeCompilerServicesUnsafeVersion)'))" />
<Reference Include="$(NuGetPackageRoot)system.runtime.compilerservices.unsafe\$(FrozenSystemRuntimeCompilerServicesUnsafeVersion)\lib\net461\System.Runtime.CompilerServices.Unsafe.dll" />
<Reference Include="$(NuGetPackageRoot)system.runtime.compilerservices.unsafe\$(FrozenSystemRuntimeCompilerServicesUnsafeVersion)\lib\net462\System.Runtime.CompilerServices.Unsafe.dll" />

<Reference Remove="@(Reference)" Condition="'%(Reference.NuGetPackageId)' == 'System.Threading.Tasks.Extensions' and $([MSBuild]::VersionGreaterThan(%(Reference.NuGetPackageVersion), '$(FrozenSystemThreadingTasksExtensionsVersion)'))" />
<Reference Include="$(NuGetPackageRoot)system.threading.tasks.extensions\$(FrozenSystemThreadingTasksExtensionsVersion)\lib\net461\System.Threading.Tasks.Extensions.dll" />
<Reference Include="$(NuGetPackageRoot)system.threading.tasks.extensions\$(FrozenSystemThreadingTasksExtensionsVersion)\lib\net462\System.Threading.Tasks.Extensions.dll" />
</ItemGroup>
</Target>

Expand Down
Loading
Loading