From e31c1e69652eb0f8cd88de6f4b9b12bf49330b56 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Sat, 12 Sep 2020 14:07:27 -0700
Subject: [PATCH] Remove package version pinning for ref/ assemblies in
 servicing - dotnet/runtime now keeps `$(AssemblyVersion)` values consistent -
 remove all use of the System.Security.AccessControl package

---
 eng/Dependencies.props                |  7 -----
 eng/Version.Details.xml               |  5 ----
 eng/Versions.props                    | 31 ---------------------
 eng/targets/ResolveReferences.targets | 39 ---------------------------
 eng/tools/RepoTasks/RepoTasks.csproj  | 10 -------
 5 files changed, 92 deletions(-)

diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 5fc48ea2c3d4..cb76d3d15ed5 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -73,8 +73,6 @@ and are generated based on the last package release.
     <LatestPackageReference Include="System.Reflection.Metadata" />
     <LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" />
     <LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
-    <!-- System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. -->
-    <LatestPackageReference Include="System.Security.AccessControl" />
     <LatestPackageReference Include="System.Security.Cryptography.Cng" />
     <LatestPackageReference Include="System.Security.Cryptography.Pkcs" />
     <LatestPackageReference Include="System.Security.Cryptography.Xml" />
@@ -196,11 +194,6 @@ and are generated based on the last package release.
     <!-- Get versions. -->
     <LatestPackageReference Update="@(LatestPackageReference)">
       <Version>$(%(VersionName)PackageVersion)</Version>
-      <RTMVersion>$(%(VersionName)V0PackageVersion)</RTMVersion>
-
-      <!-- Remove excess metadata. -->
-      <RTMVersion Condition=" '%(Version)' == '%(RTMVersion)' " />
-      <VersionName />
     </LatestPackageReference>
 
     <!--
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7e411bdb589a..6e2462eba06a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -241,11 +241,6 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>7d39776332446d8a84f5d542c80d264fa1cadbe7</Sha>
     </Dependency>
-    <!-- System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. -->
-    <Dependency Name="System.Security.AccessControl" Version="5.0.0-rc.2.20461.4">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7d39776332446d8a84f5d542c80d264fa1cadbe7</Sha>
-    </Dependency>
     <Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-rc.2.20461.4">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>7d39776332446d8a84f5d542c80d264fa1cadbe7</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index a873bd89668f..cb56aae141ce 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -118,8 +118,6 @@
     <SystemReflectionMetadataPackageVersion>5.0.0-rc.2.20461.4</SystemReflectionMetadataPackageVersion>
     <SystemResourcesExtensionsPackageVersion>5.0.0-rc.2.20461.4</SystemResourcesExtensionsPackageVersion>
     <SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-rc.2.20461.4</SystemRuntimeCompilerServicesUnsafePackageVersion>
-    <!-- System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. -->
-    <SystemSecurityAccessControlPackageVersion>5.0.0-rc.2.20461.4</SystemSecurityAccessControlPackageVersion>
     <SystemSecurityCryptographyCngPackageVersion>5.0.0-rc.2.20461.4</SystemSecurityCryptographyCngPackageVersion>
     <SystemSecurityCryptographyPkcsPackageVersion>5.0.0-rc.2.20461.4</SystemSecurityCryptographyPkcsPackageVersion>
     <SystemSecurityCryptographyXmlPackageVersion>5.0.0-rc.2.20461.4</SystemSecurityCryptographyXmlPackageVersion>
@@ -162,36 +160,7 @@
     -->
     <MicrosoftNETCoreAppRuntimeVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimeVersion>
   </PropertyGroup>
-  <!--
-    We ship ref/ assemblies for runtime packages in our targeting targeting pack. When servicing that targeting pack,
-    these assemblies must not change. Must also compile our assemblies against the initial ref/ assemblies for runtime
-    packages. But, need to test against the latest implementation assemblies and ship them in our shared framework.
-    Upshot is we need Major.Minor.0 runtime packages for compilation and the targeting pack and Major.Minor.Latest
-    runtime packages for everything else. This is not an issue for assemblies available in Microsoft.NETCore.App.Ref or
-    Microsoft.Extensions.Internal.Transport because it is next to impossible we would service those packages.
-
-    System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. Because
-    it's a transitive reference, we reship the ref/ assembly in Microsoft.AspNetCore.App.Ref. dotnet/runtime ships
-    the implementation assemblies in Microsoft.NETCore.App.Runtime.* packages.
 
-    If testing this configuration prior to servicing, update the versions of dependencies too. E.g. change
-    `$(SystemSecurityPrincipalWindowsV0PackageVersion)` if you change `$(SystemSecurityAccessControlV0PackageVersion)`
-    because System.Security.AccessControl will otherwise be loadable. This should not be necessary in servicing.
-  -->
-  <PropertyGroup Condition=" '$(IsServicingBuild)' == 'true' ">
-    <MicrosoftWin32RegistryV0PackageVersion>$(MicrosoftWin32RegistryPackageVersion.Split('.')[0]).$(MicrosoftWin32RegistryPackageVersion.Split('.')[1]).0</MicrosoftWin32RegistryV0PackageVersion>
-    <MicrosoftWin32SystemEventsV0PackageVersion>$(MicrosoftWin32SystemEventsPackageVersion.Split('.')[0]).$(MicrosoftWin32SystemEventsPackageVersion.Split('.')[1]).0</MicrosoftWin32SystemEventsV0PackageVersion>
-    <SystemDiagnosticsEventLogV0PackageVersion>$(SystemDiagnosticsEventLogPackageVersion.Split('.')[0]).$(SystemDiagnosticsEventLogPackageVersion.Split('.')[1]).0</SystemDiagnosticsEventLogV0PackageVersion>
-    <SystemDrawingCommonV0PackageVersion>$(SystemDrawingCommonPackageVersion.Split('.')[0]).$(SystemDrawingCommonPackageVersion.Split('.')[1]).0</SystemDrawingCommonV0PackageVersion>
-    <SystemIOPipelinesV0PackageVersion>$(SystemIOPipelinesPackageVersion.Split('.')[0]).$(SystemIOPipelinesPackageVersion.Split('.')[1]).0</SystemIOPipelinesV0PackageVersion>
-    <SystemSecurityAccessControlV0PackageVersion>$(SystemSecurityAccessControlPackageVersion.Split('.')[0]).$(SystemSecurityAccessControlPackageVersion.Split('.')[1]).0</SystemSecurityAccessControlV0PackageVersion>
-    <SystemSecurityCryptographyCngV0PackageVersion>$(SystemSecurityCryptographyCngPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyCngPackageVersion.Split('.')[1]).0</SystemSecurityCryptographyCngV0PackageVersion>
-    <SystemSecurityCryptographyPkcsV0PackageVersion>$(SystemSecurityCryptographyPkcsPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyPkcsPackageVersion.Split('.')[1]).0</SystemSecurityCryptographyPkcsV0PackageVersion>
-    <SystemSecurityCryptographyXmlV0PackageVersion>$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[1]).0</SystemSecurityCryptographyXmlV0PackageVersion>
-    <SystemSecurityPermissionsV0PackageVersion>$(SystemSecurityPermissionsPackageVersion.Split('.')[0]).$(SystemSecurityPermissionsPackageVersion.Split('.')[1]).0</SystemSecurityPermissionsV0PackageVersion>
-    <SystemSecurityPrincipalWindowsV0PackageVersion>$(SystemSecurityPrincipalWindowsPackageVersion.Split('.')[0]).$(SystemSecurityPrincipalWindowsPackageVersion.Split('.')[1]).0</SystemSecurityPrincipalWindowsV0PackageVersion>
-    <SystemWindowsExtensionsV0PackageVersion>$(SystemWindowsExtensionsPackageVersion.Split('.')[0]).$(SystemWindowsExtensionsPackageVersion.Split('.')[1]).0</SystemWindowsExtensionsV0PackageVersion>
-  </PropertyGroup>
   <PropertyGroup Label="Manual">
     <!-- DiagnosticAdapter package pinned temporarily until migrated/deprecated -->
     <MicrosoftExtensionsDiagnosticAdapterPackageVersion>5.0.0-preview.4.20180.4</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index fe8224d1988d..092d7aec6732 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -253,45 +253,6 @@
         Text="Could not resolve this reference. Could not locate the package or project for &quot;%(Reference.Identity)&quot;. Did you update baselines and dependencies lists? See docs/ReferenceResolution.md for more details." />
   </Target>
 
-  <!--
-    Change @(ResolvedCompileFileDefinitions) items between generation and use in order to compile against RTM lib/
-    or ref/ assemblies. The approach works for all TFMs because it happens after a specific assembly is chosen for
-    compilation; no need to restrict this to (say) the default TFM.
-
-    This target could get confused if the layout changes for one of the dozen special-cased packages during servicing.
-    E.g. ResolvePackageAssets picks a compatible assembly from the 5.0.1 package and _UseRTMReferenceAssemblies
-    changes the path to one not present in the 5.0.0 package. Fortunately, this will break the build with complaints
-    about the "invalid strong name".
-  -->
-  <Target Name="_UseRTMReferenceAssemblies"
-      Condition=" '$(MSBuildProjectName)' != 'RepoTasks' "
-      AfterTargets="ResolvePackageAssets"
-      BeforeTargets="GenerateBuildDependencyFile;GeneratePublishDependencyFile;ILLink;ResolveLockFileReferences"
-      DependsOnTargets="ResolvePackageAssets">
-    <Error Condition=" !EXISTS('$(RepoRoot)artifacts\obj\RepoTasks\RepoTasks.csproj.nuget.g.props') "
-        Text="The eng/tools/RepoTasks project must be restored before building other projects." />
-
-    <JoinItems Left="@(ResolvedCompileFileDefinitions)"
-        Right="@(LatestPackageReference->HasMetadata('RTMVersion'))"
-        LeftKey="Filename"
-        ItemSpecToUse="Left"
-        LeftMetadata="*"
-        RightMetadata="RTMVersion;Version">
-      <Output TaskParameter="JoinResult" ItemName="_ResolvedCompileFileDefinitionsToChange" />
-    </JoinItems>
-
-    <ItemGroup>
-      <ResolvedCompileFileDefinitions Remove="@(_ResolvedCompileFileDefinitionsToChange)" />
-
-      <!-- Ignore %(NuGetPackageVersion) when doing substitution because some projects use downlevel packages. -->
-      <_ResolvedCompileFileDefinitionsToChange
-          HintPath="$([System.String]::new('%(Identity)').Replace('\%(Version)\', '\%(RTMVersion)\').Replace('/%(Version)/', '/%(RTMVersion)/'))" />
-      <ResolvedCompileFileDefinitions Include="@(_ResolvedCompileFileDefinitionsToChange -> '%(HintPath)')" />
-
-      <_ResolvedCompileFileDefinitionsToChange Remove="@(_ResolvedCompileFileDefinitionsToChange)" />
-    </ItemGroup>
-  </Target>
-
   <PropertyGroup>
     <_CompileTfmUsingReferenceAssemblies>false</_CompileTfmUsingReferenceAssemblies>
     <_CompileTfmUsingReferenceAssemblies
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index 798c6c9fb356..e71a1d759183 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -36,15 +36,5 @@
     <Reference Include="Microsoft.Deployment.WindowsInstaller.Package">
       <HintPath>$(WiXSdkPath)\Microsoft.Deployment.WindowsInstaller.Package.dll</HintPath>
     </Reference>
-
-    <!--
-      Gather project references for compilation against RTM packages. %(RTMVersion) is set for about a dozen packages
-      in all servicing builds. Cannot reference two versions of a package, mandating this separation from projects
-      using the relevant packages.
-    -->
-    <PackageReference Include="@(LatestPackageReference->HasMetadata('RTMVersion'))"
-        IncludeAssets="None"
-        PrivateAssets="All"
-        Version="%(RTMVersion)" />
   </ItemGroup>
 </Project>