Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f5b9cd4
[7.0] Update backport template and servicing docs (#84005)
carlossanlop Mar 28, 2023
57d635b
Create action to check servicing label (#84041)
github-actions[bot] Mar 28, 2023
7786569
Fix piping in yml (#84042)
hoyosjs Mar 28, 2023
4c367c7
Update check-service-labels.yml (#84044)
hoyosjs Mar 28, 2023
8c9da40
[7.0] Avoid using spanish helix queues (#83747)
carlossanlop Mar 28, 2023
80d48e9
[release/7.0] Bump to new OSX 13 AppleTV queue (#83729)
steveisok Mar 29, 2023
74d0f47
[release/7.0] disable NTLM tests on RedHat.7 (#83602)
github-actions[bot] Mar 29, 2023
fb993f5
[release/7.0] Improve servicing docs for Microsoft.Windows.Compatibil…
carlossanlop Mar 29, 2023
1cee763
Fix Iran time zone test case (#84056)
carlossanlop Mar 29, 2023
721e656
Update check-service-labels to trigger on branch edit (#84106)
hoyosjs Mar 30, 2023
05038f9
[release/7.0][mono] Use unsigned char when computing UTF8 string hash…
lambdageek Mar 30, 2023
88b65f9
Ensure that default media type is used when 'null' is passed-in to St…
github-actions[bot] Mar 30, 2023
641393e
[release/7.0] [wasm] ManagedToNativeGenerator: Skip unmanaged dlls (#…
github-actions[bot] Mar 31, 2023
fa133ae
[release/7.0] Use CLOCK_BOOTTIME to calculate BootTime on linux (#675…
simonrozsival Mar 31, 2023
7cd68bc
[release/7.0] JIT: fix bug in cloning conditions for jagged array (#8…
AndyAyersMS Mar 31, 2023
001172f
[release/7.0] Ensure free buffer space when reading TLS messages (#83…
github-actions[bot] Apr 3, 2023
5301032
[release/7.0] SyntaxValueProvider: avoid performance issue with synta…
github-actions[bot] Apr 4, 2023
f8777ff
Fixing a bug that causes us to mistakenly demote a gen2 region to gen…
github-actions[bot] Apr 4, 2023
ed90f14
Fix special sweep issue for workstation (#83342)
github-actions[bot] Apr 4, 2023
eacc9be
[release/7.0] Fix encoding problem when publishing (#83577)
ilonatommy Apr 5, 2023
4a5620b
[release/7.0] [MONO][MARSHAL] Initialize ilgen with a flag (#83813)
github-actions[bot] Apr 5, 2023
0506145
[release/7.0-staging] Update dependencies from dotnet/linker dotnet/m…
dotnet-maestro[bot] Apr 6, 2023
c2d6594
[release/7.0] Fix pinned assembly version 7.0 (#84355)
ericstj Apr 6, 2023
694c2a0
Merge branch 'release/7.0-staging' into release70
carlossanlop Apr 7, 2023
cb70e92
Manually resolve spacing conflict in check-service-labels.yml
carlossanlop Apr 7, 2023
d71dd07
Merge branch 'release70' of github.com:carlossanlop/runtime into rele…
carlossanlop Apr 7, 2023
48abc27
Merge pull request #84459 from carlossanlop/release70
carlossanlop Apr 7, 2023
7e8c33e
Reverting: Set AssemblyName.ProcessorArchitecture for compatibility. …
VSadov Apr 7, 2023
50722b0
[release/7.0] Fix reserving executable memory as per allocation type …
github-actions[bot] Apr 10, 2023
8a0b03e
[release/7.0][Android] Free up more disk space on CI builds (#84567)
steveisok Apr 10, 2023
3947f8d
Update dependencies from https://github.com/dotnet/linker build 20230…
dotnet-maestro[bot] Apr 10, 2023
d566ecf
[7.0] Reset OOB packages from 7.0.5 (#84341)
carlossanlop Apr 11, 2023
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
Prev Previous commit
Next Next commit
[release/7.0] Fix pinned assembly version 7.0 (#84355)
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing.

As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect.

Please find the full list of impacted assemblies below:
- System.ComponentModel.Composition
- System.DirectoryServices
- System.DirectoryServices.AccountManagement
- System.DirectoryServices.Protocols
- System.Management
- System.Reflection.Context
- System.Runtime.Caching
- System.Speech

For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing.

* Enable System.Management and System.DirectoryServices.Protocols in servicing

* Address feedback
  • Loading branch information
ericstj authored Apr 6, 2023
commit c2d6594855805c72e8cd93a17d0bd9532360d46f
2 changes: 1 addition & 1 deletion eng/packaging.targets
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsWindowsDesktopApp>
<_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsAspNetCoreApp>
<_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(IsNetCoreAppRef)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true</_AssemblyInTargetingPack>
<!-- Assembly version do not get updated in non-netfx ref pack assemblies. -->
<!-- The assembly version gets updated when the assembly isn't part of a targeting pack. -->
<AssemblyVersion Condition="'$(_AssemblyInTargetingPack)' != 'true'">$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)</AssemblyVersion>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<!-- Reference the outputs for the dependency nodes calculation. -->
<NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>2</ServicingVersion>
<!-- This is a meta package and doesn't contain any libs. -->
<NoWarn>$(NoWarn);NU5128</NoWarn>
<PackageDescription>This Windows Compatibility Pack provides access to APIs that were previously available only for .NET Framework. It can be used from both .NET as well as .NET Standard.</PackageDescription>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>ECMA</StrongNameKeyId>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the .NETFramework version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>ECMA</StrongNameKeyId>
<SupportedOSPlatforms>windows</SupportedOSPlatforms>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the .NETFramework version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser;android;ios;tvos</UnsupportedOSPlatforms>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project>
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the .NETStandard assembly
remains <= the .NETFramework version.
Allow non-NETStandard assemblies to version to be compatible with past serviced packages which
shipped higher versions. -->
<AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard2.0'">4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<IsPackable>true</IsPackable>
<!-- If you enable GeneratePackageOnBuild for this package and bump ServicingVersion, make sure to also bump ServicingVersion in Microsoft.Windows.Compatibility.csproj once for the next release. -->
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<ServicingVersion>0</ServicingVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
<Nullable>annotations</Nullable>
<AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
<AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
Expand Down
4 changes: 0 additions & 4 deletions src/libraries/System.DirectoryServices/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<!-- Since this assembly version is pinned, we don't want to validate that it matches
the expected assembly version on the targeting pack. -->
<SkipValidateAssemblyVersion>true</SkipValidateAssemblyVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the .NETFramework version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/libraries/System.Management/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<SupportedOSPlatforms>windows</SupportedOSPlatforms>
</PropertyGroup>
Expand Down
10 changes: 10 additions & 0 deletions src/libraries/System.Management/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project>
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the .NETStandard assembly
remains <= the .NETFramework version.
Allow non-NETStandard assemblies to version to be compatible with past serviced packages which
shipped higher versions. -->
<AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard2.0'">4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/libraries/System.Management/src/System.Management.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<IsPackable>true</IsPackable>
<!-- If you enable GeneratePackageOnBuild for this package and bump ServicingVersion, make sure to also bump ServicingVersion in Microsoft.Windows.Compatibility.csproj once for the next release. -->
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>2</ServicingVersion>
<AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
<AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
<PackageDescription>Provides access to a rich set of management information and management events about the system, devices, and applications instrumented to the Windows Management Instrumentation (WMI) infrastructure.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<AssemblyVersion>4.0.3.0</AssemblyVersion>
<StrongNameKeyId>ECMA</StrongNameKeyId>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the .NETFramework version.
4.0.3.0 breaks this causing https://github.com/dotnet/runtime/issues/84320 -->
<AssemblyVersion>4.0.3.0</AssemblyVersion>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/libraries/System.Runtime.Caching/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/System.Runtime.Caching/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the .NETFramework version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
4 changes: 0 additions & 4 deletions src/libraries/System.Speech/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<!-- this assembly is inbox in desktop, do not version it unless you
plan on shipping a new desktop version out of band. Instead add API
to a different assembly. -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<StrongNameKeyId>MicrosoftShared</StrongNameKeyId>
<SupportedOSPlatforms>windows</SupportedOSPlatforms>
</PropertyGroup>
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/System.Speech/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>
<Import Project="..\Directory.Build.targets" />
<PropertyGroup>
<!-- This assembly is inbox in .NETFramework, ensure that the AssemblyVersion
remains <= the .NETFramework version -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>