Dead Ending Microsoft.CSharp Package and Bumping the leftout assembly versions to...

* 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

diff --git a/src/libraries/Microsoft.CSharp/Directory.Build.props b/src/libraries/Microsoft.CSharp/Directory.Build.props
index a37afe183e32219a2de66b5bd517220287a47807..9155a7a076498478676fd485aed9792e34c80ead 100644 (file)
--- 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
deleted file mode 100644 (file)
index f70d26f..0000000
--- a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
+++ /dev/null
@@ -1,44 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\Microsoft.CSharp.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\Microsoft.CSharp.csproj" />
-    <HarvestIncludePaths Include="ref/netcore50;lib/netcore50" />
-    <HarvestIncludePaths Include="ref/netstandard1.0" />
-    <HarvestIncludePaths Include="lib/netstandard1.3" />
-    <InboxOnTargetFramework Include="MonoAndroid10">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <InboxOnTargetFramework Include="MonoTouch10">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <InboxOnTargetFramework Include="net45">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <InboxOnTargetFramework Include="netcoreapp2.0" />
-    <InboxOnTargetFramework Include="uap10.0.16299" />
-    <InboxOnTargetFramework Include="win8" />
-    <InboxOnTargetFramework Include="wp80" />
-    <InboxOnTargetFramework Include="wpa81" />
-    <InboxOnTargetFramework Include="portable-net45+win8+wp8+wpa81" />
-    <InboxOnTargetFramework Include="xamarinios10">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <InboxOnTargetFramework Include="xamarinmac20">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <InboxOnTargetFramework Include="xamarintvos10">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <InboxOnTargetFramework Include="xamarinwatchos10">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <ValidatePackageSuppression Include="PermitMissingImplementation">
-      <!-- Supported inbox by all ns1.0-1.2 frameworks -->
-      <Value>.NETStandard,Version=v1.0;.NETStandard,Version=v1.1;.NETStandard,Version=v1.2</Value>
-    </ValidatePackageSuppression>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.CSharp/ref/Configurations.props b/src/libraries/Microsoft.CSharp/ref/Configurations.props
index cbdceb9443745ac4bcca966c5a87ab951b1415ac..7ac45c966c45626b1ea4c22b6b37b84cced59237 100644 (file)
--- 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>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
index 1009834ecd49aeb9c7e253dfae011000e44931c8..eb45bddc74742880e917020acc4489b78fc235df 100644 (file)
--- 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>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.CSharp/src/Configurations.props b/src/libraries/Microsoft.CSharp/src/Configurations.props
index 781348267d404a54b01814c0e32e1b28f09f4e5a..7ac45c966c45626b1ea4c22b6b37b84cced59237 100644 (file)
--- 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>
\ No newline at end of file

diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
index 6faf7bdc579dc9cd4d1bec7c2c2075b0110a8479..ea6307a2ca3d97a13cba57f0c54f2825074074d2 100644 (file)
--- 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
index ac021c8da3d65c6e157b835018d0a224cd07b62c..5f6e490332e15abcd5bc4ef2bdc98be15989b844 100644 (file)
--- 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/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
index 11df29a247f2fa46d3454ad1693245e3b836757e..d46b21c27009b86dde5c82039dc697cb0e246939 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
+++ b/src/libraries/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/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il
index ced09b67754c2d9b25b421663fd84fd19dcbaa3f..52f2002a128efd8afb25508484a9a9f1d202bc5f 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il
+++ b/src/libraries/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
index ce2b36ac8bbac243161cb47151673b76b34091e8..0a4395bfbcbaac9606766108cf37039315fed7bf 100644 (file)
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -83,7 +83,6 @@
         "4.5.0",
         "4.6.0"
       ],
-      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp2.1": "4.0.4.0",
@@ -4051,7 +4050,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 +4062,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
index 8cb1e4258dab3fb4378221a43b63c5d91992480f..b612f41f0a573cf6689adf2b8146d10d466002d5 100644 (file)
--- 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
index bc6aa5222f1057fb3adbe5b439fee83f745741a1..3ba2a5d9ed039f5a8896c5fdf6465ed7c6c76e6d 100644 (file)
--- a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets
+++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets
@@ -5,4 +5,8 @@
     <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
     <KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
   </ItemGroup>
+
+  <ItemGroup>
+    <IgnoredReference Include="System.Runtime.CompilerServices.Unsafe" />
+  </ItemGroup>
 </Project>
\ No newline at end of file