Skip to content

Don't reference the netstandard shim inside the shared framework #53023

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

Merged
ViktorHofer merged 28 commits into from
Jun 10, 2021
Merged

Don't reference the netstandard shim inside the shared framework #53023

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
84a7872
Don't reference ns.dll inside shared framework
ViktorHofer May 20, 2021
0d414d3
Add netcoreapp2.0 config to SystemEvents
ViktorHofer May 20, 2021
35497b1
Reference netstandard shim in OOBs that require it
ViktorHofer May 20, 2021
15f7a63
Add fallback folder for NetCoreAppCurrent for ApiCompat
ViktorHofer May 20, 2021
a245863
Fix unix configurations
ViktorHofer May 21, 2021
494691d
Fix NullableAttribute ifdefs and trim using
ViktorHofer May 21, 2021
7559971
More fixes
ViktorHofer May 21, 2021
86f2e60
Add additional .NETCoreApp configurations to avoid NS shim
ViktorHofer May 25, 2021
b1b8c5e
Rebase errors fixed
ViktorHofer May 28, 2021
7526e04
Remove unnecessary netcoreapp3.1 configs
ViktorHofer May 31, 2021
5e963d9
Add one more config
ViktorHofer May 31, 2021
774f5ae
Undo ExcludeNetCoreAppCurrent changes
ViktorHofer May 31, 2021
2c3d9f0
Update Microsoft.NETCore.Platforms.csproj
ViktorHofer May 31, 2021
f8fa9c7
Disable failing CodeDom tests
ViktorHofer Jun 1, 2021
fa2d97d
Merge branch 'main' into DefineNetStandardRef
ViktorHofer Jun 8, 2021
577c0f7
Update RequiresUnreferencedCodeAttribute.cs
ViktorHofer Jun 9, 2021
4db5ecd
Update Microsoft.Extensions.Primitives.csproj
ViktorHofer Jun 9, 2021
f5123ff
Update System.Diagnostics.DiagnosticSource.csproj
ViktorHofer Jun 9, 2021
19dd369
Merge remote-tracking branch 'upstream/main' into DefineNetStandardRef
ViktorHofer Jun 9, 2021
1b9c2db
Disable failing tests
ViktorHofer Jun 9, 2021
f6175b8
Apply suggestions from code review
ViktorHofer Jun 10, 2021
a65671c
Update VBCodeGenerationTests.cs
ViktorHofer Jun 10, 2021
459305d
Update ConfigurationSectionTest.cs
ViktorHofer Jun 10, 2021
01a9ab2
Update CodeTypeReference.cs
ViktorHofer Jun 10, 2021
2da8671
Update Microsoft.Extensions.Logging.Console.csproj
ViktorHofer Jun 10, 2021
f461ee8
Update disableVerifyClosure.targets
ViktorHofer Jun 10, 2021
3855df9
Update disableVerifyClosure.targets
ViktorHofer Jun 10, 2021
120d839
PR feedback
ViktorHofer Jun 10, 2021
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
Prev Previous commit
Next Next commit
Merge branch 'main' into DefineNetStandardRef
  • Loading branch information
@ViktorHofer
ViktorHofer authored Jun 8, 2021
commit fa2d97dce1e7e8971d6027811a6a275dd1a513f9
1 change: 0 additions & 1 deletion src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<NoWarn>$(NoWarn);CA1838</NoWarn>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
Expand Down
1 change: 0 additions & 1 deletion ...es/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion ...DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<DefineConstants>$(DefineConstants);FLAVOR_WHIDBEY;PAPI_AD;PAPI_REGSAM;USE_CTX_CACHE</DefineConstants>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<NoWarn>$(NoWarn);CA2249</NoWarn>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
Expand Down
1 change: 0 additions & 1 deletion ...ibraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp3.1-windows;netcoreapp3.1-OSX;netcoreapp3.1-Linux;netcoreapp3.1;netstandard2.0</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion ...ibraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<Nullable>enable</Nullable>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Management/src/System.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<NoWarn>$(NoWarn);0618</NoWarn>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<Nullable>enable</Nullable>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-Unix;netcoreapp3.1;netstandard2.0-windows;netstandard2.0-Unix;netstandard2.0;net461-windows</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
1 change: 0 additions & 1 deletion ...ystem.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<NoWarn>$(NoWarn);CA2249</NoWarn>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Speech/src/System.Speech.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0</TargetFrameworks>
Copy link
Member

@eerhardt eerhardt Jun 10, 2021

Choose a reason for hiding this comment

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

why doesn't this have $(NetCoreAppCurrent)? We seem to do that elsewhere

Copy link
Member Author

@ViktorHofer ViktorHofer Jun 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

To avoid the netstandard.dll shim when P2Pin the library, a .NETCoreApp configuration must be present. As this is just a PNSE, it doesn't matter if it's netcorepap3.1 or $(NetCoreAppCurrent).

Copy link
Member

@eerhardt eerhardt Jun 10, 2021

Choose a reason for hiding this comment

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

You don't follow that same policy on

src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj

There you added both $(NetCoreAppCurrent) and netcoreapp3.1.

Copy link
Member Author

@ViktorHofer ViktorHofer Jun 10, 2021

Choose a reason for hiding this comment

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

True. I think for Principal.Windows I chose to add $(NetCoreAppCurrent) configuration to the source so that in case another rid-less $(NetCoreAppCurrent) project references Principal.Windows, it will get the $(NetCoreAppCurrent) reference assembly. Without adding the configuration, the netcoreapp3.1 asset would be chosen.

It shouldn't really matter though as the API set is identical but I felt like it's better to guarantee that $(NetCoreAppCurrent) reference assemblies are always chosen if possible over others.

<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<!-- CS0649: uninitialized interop type fields -->
<!-- SA1129: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3277 -->
<NoWarn>$(NoWarn);CS0649;SA1129</NoWarn>
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
<!-- Generator for code mapping table, target to invoke is GenerateEncodingSource -->
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<Nullable>enable</Nullable>
<!-- CS3011: Only CLS-compliant members can be abstract -->
<!-- CS3019: CLS attributes on internal types. Some shared source files are internal in this project. -->
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.