DeadEnding Microsoft.CSharp and Bumping Version for System.Runtime.Co…

…mpilerServices.Unsafe (#2354) * Dead Ending Microsoft.CSharp Package and Bumping the leftout assembly versions to 5.0.0.0 (#2264) * deadending Microsoft.Csharp Package and bumping the assembly versions * retargeting and clean up * Update Microsoft.CSharp.csproj * fixing the build * reference -> projectreference * adding ignored reference * removing package references and making R2rDump bin place to a specifc output directory * remove package reference from R2r dump as well * adding comment and targeting netstandard2.0 * adding back package references for netstandard lib build * adding back baseline version for consistency
dotnet · Feb 4, 2020 · 5cbd74c · 5cbd74c
1 parent 0f0b594
commit 5cbd74c
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 84 deletions.
diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
@@ -22,14 +22,6 @@
     <ProjectReference Include="..\ILCompiler.TypeSystem.ReadyToRun\ILCompiler.TypeSystem.ReadyToRun.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Reflection.Metadata">
-      <Version>1.6.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>4.3.0</Version>
-    </PackageReference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Common\Internal\Runtime\CorConstants.cs" Link="Common\CorConstants.cs" />
     <Compile Include="..\..\Common\Internal\Runtime\ReadyToRunConstants.cs" Link="Common\ReadyToRunConstants.cs" />

diff --git a/src/coreclr/src/tools/r2rdump/R2RDump.csproj b/src/coreclr/src/tools/r2rdump/R2RDump.csproj
@@ -12,7 +12,7 @@
     <CLSCompliant>false</CLSCompliant>
     <NoWarn>8002,NU1701</NoWarn>
     <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
-    <OutputPath>$(BinDir)</OutputPath>
+    <OutputPath>$(BinDir)/R2RDump</OutputPath>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
@@ -23,9 +23,6 @@
     <PackageReference Include="System.CommandLine.Experimental">
       <Version>0.2.0-alpha.19174.3</Version>
     </PackageReference>
-    <PackageReference Include="System.Reflection.Metadata">
-      <Version>1.6.0</Version>
-    </PackageReference>
     <ProjectReference Include="..\crossgen2\ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.CSharp/Directory.Build.props b/src/libraries/Microsoft.CSharp/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>

diff --git a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
diff --git a/src/libraries/Microsoft.CSharp/ref/Configurations.props b/src/libraries/Microsoft.CSharp/ref/Configurations.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netstandard2.0;
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Must match version supported by frameworks which support 4.0.* inbox.
-         Can be removed when API is added and this assembly is versioned to 4.1.* -->
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <Configurations>netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.CSharp.cs" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\System.Linq\ref\System.Linq.csproj" />
+    <ProjectReference Include="..\..\System.Linq.Expressions\ref\System.Linq.Expressions.csproj" />
+    <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/src/libraries/Microsoft.CSharp/src/Configurations.props b/src/libraries/Microsoft.CSharp/src/Configurations.props
@@ -1,8 +1,7 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netstandard2.0;
-      _$(NetFrameworkCurrent);
+      $(NetCoreAppCurrent);
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.CSharp</AssemblyName>
     <RootNamespace>Microsoft.CSharp</RootNamespace>
-    <Configurations>netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft\CSharp\RuntimeBinder\ArgumentObject.cs" />
@@ -161,6 +161,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Collections" />
+    <Reference Include="System.Collections.Concurrent" />
     <Reference Include="System.Diagnostics.Debug" />
     <Reference Include="System.Diagnostics.Tools" />
     <Reference Include="System.Linq" />

diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props b/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.5.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>

diff --git a/...System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/...System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
@@ -3,7 +3,7 @@
   <ItemGroup>
     <PackageIndex Include="$(PkgDir)baseline\packageBaseline.1.1.json" />
     <ProjectReference Include="..\ref\System.Runtime.CompilerServices.Unsafe.csproj">
-      <SupportedFramework>net45;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net45;netcoreapp1.0;netcore50;netcore45;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.CompilerServices.Unsafe.ilproj" />
 

diff --git a/...ries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il b/...ries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il
@@ -13,8 +13,8 @@
   // --- The following custom attribute is added automatically, do not uncomment -------
   //  .custom instance void [CORE_ASSEMBLY]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [CORE_ASSEMBLY]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 02 00 00 00 00 00 )
 
-  .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 34 2E 30 2E 30 2E 30 00 00 )             // ...4.0.0.0..
-  .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = ( 01 00 07 34 2E 30 2E 30 2E 30 00 00 )             // ...4.0.0.0..
+  .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 )             // ...5.0.0.0..
+  .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 )             // ...5.0.0.0..
   .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyTitleAttribute::.ctor(string) = ( 01 00 26 53 79 73 74 65 6D 2E 52 75 6E 74 69 6D   // ..&System.Runtim
                                                                                               65 2E 43 6F 6D 70 69 6C 65 72 53 65 72 76 69 63   // e.CompilerServic
                                                                                               65 73 2E 55 6E 73 61 66 65 00 00 )                // es.Unsafe..
@@ -41,7 +41,7 @@
     01 00 00 00 00
   ) // false
   .hash algorithm 0x00008004
-  .ver 4:0:5:0
+  .ver 5:0:0:0
 }
 .module System.Runtime.CompilerServices.Unsafe.dll
 // MVID: {1E97D84A-565B-49C5-B60A-F31A1A4ACE13}

diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -83,7 +83,7 @@
         "4.5.0",
         "4.6.0"
       ],
-      "BaselineVersion": "5.0.0",
+      "BaselineVersion": "4.6.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp2.1": "4.0.4.0",
@@ -4051,7 +4051,8 @@
         "4.5.0",
         "4.5.1",
         "4.5.2",
-        "4.6.0"
+        "4.6.0",
+        "4.7.0"
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
@@ -4062,7 +4063,8 @@
         "4.0.3.0": "4.4.0",
         "4.0.4.0": "4.5.0",
         "4.0.4.1": "4.5.2",
-        "4.0.5.0": "4.6.0"
+        "4.0.5.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Runtime.CompilerServices.VisualC": {

diff --git a/src/libraries/pkg/descriptions.json b/src/libraries/pkg/descriptions.json
@@ -14,17 +14,6 @@
     "Description": "Provides a portable version of the Microsoft.Cci library",
     "CommonTypes": []
   },
-  {
-    "Name": "Microsoft.CSharp",
-    "Description": "Provides support for compilation and code generation, including dynamic, using the C# language.",
-    "CommonTypes": [
-      "Microsoft.CSharp.RuntimeBinder.Binder",
-      "Microsoft.CSharp.RuntimeBinder.RuntimeBinderException",
-      "Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo",
-      "Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfoFlags",
-      "Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags"
-    ]
-  },
   {
     "Name": "Microsoft.Bcl.HashCode",
     "Description": "Provides the HashCode type for .NET Standard 2.0. This package is not required starting with .NET Standard 2.1 and .NET Core 3.0.",

diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets
@@ -8,4 +8,9 @@
     <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
     <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
   </ItemGroup>
+
+  <!-- This should be removed after the sdk contains the 5.0.0.0 assembly version of this assembly. -->
+  <ItemGroup>
+    <IgnoredReference Include="System.Runtime.CompilerServices.Unsafe" />
+  </ItemGroup>
 </Project>