Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Jan 29, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de5eb34
deadending Microsoft.Csharp Package and bumping the assembly versions
Anipik Jan 28, 2020
c86df57
retargeting and clean up
Anipik Jan 28, 2020
dfbccf1
Merge branch 'master' into FixAssemblVersions
Anipik Jan 28, 2020
9a4b0f1
Update Microsoft.CSharp.csproj
Anipik Jan 28, 2020
5276422
fixing the build
Anipik Jan 28, 2020
51440fb
reference -> projectreference
Anipik Jan 28, 2020
f64ab6c
adding ignored reference
Anipik Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/libraries/Microsoft.CSharp/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<AssemblyVersion>4.0.4.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
Expand Down
44 changes: 0 additions & 44 deletions src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/libraries/Microsoft.CSharp/ref/Configurations.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<BuildConfigurations>
netstandard2.0;
$(NetCoreAppCurrent);
</BuildConfigurations>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 1 addition & 2 deletions src/libraries/Microsoft.CSharp/src/Configurations.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project>
<PropertyGroup>
<BuildConfigurations>
netstandard2.0;
_$(NetFrameworkCurrent);
$(NetCoreAppCurrent);
</BuildConfigurations>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
View file
Open in desktop
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>netstandard2.0-Debug;netstandard2.0-Release</Configurations>
<Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
</PropertyGroup>
<ItemGroup>
<Compile Include="Microsoft\CSharp\RuntimeBinder\ArgumentObject.cs" />
Expand Down Expand Up @@ -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" />
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<AssemblyVersion>4.0.5.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
View file
Open in desktop
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;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>net45;netcoreapp1.0;netcore50;netcore45;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Runtime.CompilerServices.Unsafe.ilproj" />

Expand Down
6 changes: 3 additions & 3 deletions ...ries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il
View file
Open in desktop
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 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..
Expand All @@ -41,7 +41,7 @@
01 00 00 00 00
) // false
.hash algorithm 0x00008004
.ver 4:0:5:0
.ver 5:0:0:0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separate issue. We should see about setting define's to flow the actual values from the build-system. That way we get real fileversion and assembly version in ILProj-built assemblies.

}
.module System.Runtime.CompilerServices.Unsafe.dll
// MVID: {1E97D84A-565B-49C5-B60A-F31A1A4ACE13}
Expand Down
7 changes: 4 additions & 3 deletions src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down
11 changes: 0 additions & 11 deletions src/libraries/pkg/descriptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
4 changes: 4 additions & 0 deletions src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>