Skip to content

Commit

Permalink
Revert "Dead Ending Microsoft.CSharp Package and Bumping the leftout …
Browse files Browse the repository at this point in the history
…assembly versions to 5.0.0.0 (#2264)" (#2344)

This reverts commit 5fca041.
  • Loading branch information
jkotas authored Jan 29, 2020
1 parent e135385 commit 89045e5
Show file tree
Hide file tree
Showing 12 changed files with 72 additions and 23 deletions.
1 change: 1 addition & 0 deletions src/libraries/Microsoft.CSharp/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<AssemblyVersion>4.0.4.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
Expand Down
44 changes: 44 additions & 0 deletions src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<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>
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.CSharp/ref/Configurations.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<BuildConfigurations>
$(NetCoreAppCurrent);
netstandard2.0;
</BuildConfigurations>
</PropertyGroup>
</Project>
11 changes: 4 additions & 7 deletions src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
<!-- 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>
</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>
3 changes: 2 additions & 1 deletion src/libraries/Microsoft.CSharp/src/Configurations.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project>
<PropertyGroup>
<BuildConfigurations>
$(NetCoreAppCurrent);
netstandard2.0;
_$(NetFrameworkCurrent);
</BuildConfigurations>
</PropertyGroup>
</Project>
3 changes: 1 addition & 2 deletions src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<AssemblyName>Microsoft.CSharp</AssemblyName>
<RootNamespace>Microsoft.CSharp</RootNamespace>
<Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
<Configurations>netstandard2.0-Debug;netstandard2.0-Release</Configurations>
</PropertyGroup>
<ItemGroup>
<Compile Include="Microsoft\CSharp\RuntimeBinder\ArgumentObject.cs" />
Expand Down Expand Up @@ -161,7 +161,6 @@
</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" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<AssemblyVersion>4.0.5.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;netcore50;netcore45;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>net45;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Runtime.CompilerServices.Unsafe.ilproj" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 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.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.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..
Expand All @@ -41,7 +41,7 @@
01 00 00 00 00
) // false
.hash algorithm 0x00008004
.ver 5:0:0:0
.ver 4:0:5:0
}
.module System.Runtime.CompilerServices.Unsafe.dll
// MVID: {1E97D84A-565B-49C5-B60A-F31A1A4ACE13}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
"4.5.0",
"4.6.0"
],
"BaselineVersion": "5.0.0",
"InboxOn": {
"netcoreapp2.0": "4.0.3.0",
"netcoreapp2.1": "4.0.4.0",
Expand Down Expand Up @@ -4050,8 +4051,7 @@
"4.5.0",
"4.5.1",
"4.5.2",
"4.6.0",
"4.7.0"
"4.6.0"
],
"BaselineVersion": "5.0.0",
"InboxOn": {
Expand All @@ -4062,8 +4062,7 @@
"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",
"5.0.0.0": "5.0.0"
"4.0.5.0": "4.6.0"
}
},
"System.Runtime.CompilerServices.VisualC": {
Expand Down
11 changes: 11 additions & 0 deletions src/libraries/pkg/descriptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@
"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.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,4 @@
<KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
<KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App.WindowsForms" />
</ItemGroup>

<ItemGroup>
<IgnoredReference Include="System.Runtime.CompilerServices.Unsafe" />
</ItemGroup>
</Project>

0 comments on commit 89045e5

Please sign in to comment.