Remove Microsoft.Windows.Compatibility.Shims package (dotnet#36644)

* Remove Microsoft.Windows.Compatibility.Shims package

* PR Feedback

Directory.Build.props

@@ -343,7 +343,6 @@
     <TargetOutputRelPath Condition="'$(TargetGroup)'!=''">$(TargetGroup)/</TargetOutputRelPath>
 
     <RuntimePath Condition="'$(RuntimePath)' == ''">$(ArtifactsBinDir)runtime/$(BuildConfiguration)/</RuntimePath>
-    <ShimsTargetRuntimeRoot>$(ArtifactsBinDir)shimsTargetRuntime/</ShimsTargetRuntimeRoot>
     <TestWorkingDir Condition="'$(TestWorkingDir)'==''">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'tests'))</TestWorkingDir>
     <TestPath Condition="'$(TestPath)' == ''">$([MSBuild]::NormalizeDirectory('$(TestWorkingDir)', '$(MSBuildProjectName)', '$(BuildConfiguration)'))</TestPath>
     <RefRootPath>$(ArtifactsBinDir)ref/</RefRootPath>

Directory.Build.targets

@@ -115,9 +115,6 @@
     <BinPlaceConfiguration Condition="'$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp2.0">
       <RefPath>$(RefRootPath)netcoreapp2.0/</RefPath>
     </BinPlaceConfiguration>
-    <BinPlaceConfiguration Include="netcoreapp2.0-Windows_NT">
-      <RuntimePath>$(ShimsTargetRuntimeRoot)netcoreapp2.0/</RuntimePath>
-    </BinPlaceConfiguration>
     <!-- some libraries that produce packages will remain targeting uap10.0.16299 -->
     <BinPlaceConfiguration Condition="'$(BuildingUAPVertical)' == 'true' OR '$(BuildingUAPAOTVertical)' == 'true'" Include="uap10.0.16299">
       <RefPath>$(RefRootPath)uap10.0.16299/</RefPath>

eng/dependencies.props

@@ -99,10 +99,6 @@
     </XmlUpdateStep>
   </ItemGroup>
 
-  <PropertyGroup>
-    <CompatibilityShimsPackageVersion>2.1.0</CompatibilityShimsPackageVersion>
-  </PropertyGroup>
-
   <!-- Set up dependencies on packages that aren't found in a BuildInfo. -->
   <ItemGroup>
     <TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.5" />

external/netcoreapp/Configurations.props

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp2.0;
-      netcoreapp2.0-Windows_NT;
       netcoreapp2.1;
     </BuildConfigurations>
   </PropertyGroup>

external/netcoreapp/netcoreapp.depproj

@@ -9,16 +9,6 @@
     <BinPlaceRef>true</BinPlaceRef>
   </PropertyGroup>
 
-  <!-- The windows specific configuration provides the implementation assemblies to create shims
-    and the non-OS the ref assemblies. -->
-  <PropertyGroup Condition="'$(TargetsWindows)' == 'true'">
-    <!-- We use the win implementation to create the shims shipped inside the compat pack -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <BinPlaceRuntime>true</BinPlaceRuntime>
-    <BinPlaceRef>false</BinPlaceRef>
-    <NuGetDeploySourceItem>ReferenceCopyLocalPaths</NuGetDeploySourceItem>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.App">
       <Version>$(NETCoreAppPackageVersion)</Version>
@@ -28,8 +18,7 @@
   <ItemGroup>
     <!-- for all configurations this project provides refs for that configuration -->
     <BinPlaceConfiguration Include="$(Configuration)">
-      <RefPath Condition="'$(BinPlaceRef)' == 'true'">$(RefPath)</RefPath>
-      <RuntimePath Condition="'$(BinPlaceRuntime)' == 'true'">$(ShimsTargetRuntimeRoot)$(TargetGroup)/</RuntimePath>
+      <RefPath>$(RefPath)</RefPath>
     </BinPlaceConfiguration>
 
     <FileToExclude Include="System.ComponentModel.Composition" />

pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj

@@ -89,7 +89,7 @@
     </Dependency>
     <!-- Include dependency to shims package -->
     <Dependency Include="Microsoft.Windows.Compatibility.Shims">
-      <Version>$(CompatibilityShimsPackageVersion)</Version>
+      <Version>2.0.1</Version>
       <TargetFramework>netcoreapp2.0</TargetFramework>
     </Dependency>
   </ItemGroup>

src/shims/manual/Directory.Build.props

@@ -1,10 +1,6 @@
 <Project>
   <PropertyGroup>
-    <PackageConfigurations>
-      netcoreapp2.0;
-    </PackageConfigurations>
     <BuildConfigurations>
-      $(PackageConfigurations);
       netcoreapp;
       netcoreappaot;
       uap;
@@ -15,8 +11,6 @@
   <!-- need to by-pass the Directory.Build.props in the shims directory for this project -->
   <Import Project="..\..\Directory.Build.props" />
   <PropertyGroup>
-    <_RuntimePath Condition="'$(TargetGroup)' == 'netcoreapp' OR '$(TargetGroup)' == 'uap' OR '$(TargetGroup)' == 'netcoreappaot'">$(RuntimePath)</_RuntimePath>
-    <_RuntimePath Condition="'$(TargetGroup)' == 'netcoreapp2.0'">$(ShimsTargetRuntimeRoot)netcoreapp2.0/</_RuntimePath>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>ECMA</StrongNameKeyId>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
@@ -31,7 +25,7 @@
 
   <ItemGroup>
     <ReferencePath
-      Include="$(_RuntimePath)System.*.dll;$(_RuntimePath)Microsoft.Win32.*.dll"
-      Exclude="$(_RuntimePath)System.dll;$(_RuntimePath)System.Data.dll" />
+      Include="$(RuntimePath)System.*.dll;$(RuntimePath)Microsoft.Win32.*.dll"
+      Exclude="$(RuntimePath)System.dll;$(RuntimePath)System.Data.dll" />
   </ItemGroup>
 </Project>

src/shims/shims.proj

@@ -1,13 +1,4 @@
 <Project DefaultTargets="Build">
-  <PropertyGroup>
-    <PackageConfigurations>
-      netcoreapp2.0
-    </PackageConfigurations>
-    <BuildConfigurations>
-      $(PackageConfigurations)
-    </BuildConfigurations>
-  </PropertyGroup>
-
   <Import Project="Directory.Build.props" />
 
   <Target Name="GetGenFacadesInputs">
@@ -49,7 +40,6 @@
       FacadePath="$(GenFacadesOutputPath)"
       ProducePdb="$(ProducePdb)"
       IgnoreMissingTypes="$(GenFacadesIgnoreMissingTypes)"
-      IgnoreBuildAndRevisionMismatch="$(GenFacadesIgnoreBuildAndRevisionMismatch)"
       ForceZeroVersionSeeds="$(GenFacadesForceZeroVersionSeeds)"
       BuildPartialReferenceFacade="$(GenFacadesBuildPartialReferenceFacade)"
     />
@@ -98,25 +88,4 @@
       <FileWrites Include="@(BinPlaceItem)" />
     </ItemGroup>
   </Target>
-
-  <Target Name="GetCompatibilityShimsToPackage"
-          BeforeTargets="GetFilesToPackage">
-    <ItemGroup>
-      <!-- All the shims defined in netfxreference.props produced by this project need to be included in the ref path. -->
-      <FilesToPackage Include="@(NetFxReference->'$(GenFacadesOutputPath)%(Identity).dll')">
-        <TargetFramework>netcoreapp2.0</TargetFramework>
-        <TargetPath>/ref/netcoreapp2.0</TargetPath>
-      </FilesToPackage>
-
-      <!-- For the implementation path in the package we only want to include the non-manual shims produced by this project
-      and the manual shims that we produce against the 2.0.0 implementation will be included to the shims package through
-      a project reference, therefore we need to exclude them here.     -->
-      <_manualShimProjects Include="manual\*.csproj" />
-      <_manualShims Include="@(_manualShimProjects->'%(FileName)')" />
-      <_libShims Include="@(NetFxReference)" Exclude="@(_manualShims)" />
-    </ItemGroup>
-    <PropertyGroup>
-      <TargetPath>@(_libShims->'$(GenFacadesOutputPath)%(Identity).dll')</TargetPath>
-    </PropertyGroup>
-  </Target>
 </Project>