Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Stabilize configurations for compat pack - #25017

Merged
safern merged 9 commits into
dotnet:masterfrom
safern:StabilizeConfigurationsForCompatPack
Nov 3, 2017
Merged

Stabilize configurations for compat pack#25017
safern merged 9 commits into
dotnet:masterfrom
safern:StabilizeConfigurationsForCompatPack

Conversation

@safern

@safern safern commented Nov 2, 2017

Copy link
Copy Markdown
Member

With this change all the packages included in the compat pack are netstandard2.0 and netcoreapp2.0 compatible and none of them now include a 2.1 asset.

I also did a small cleanup of not necessary configurations and conditions in the csproj files.

I split every project in a different commit so it is easier to review.

cc: @weshaggard @joperezr @danmosemsft

</PackageConfigurations>
<BuildConfigurations>
$(PackageConfigurations);
netcoreapp-Windows_NT;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I suppose these guys are here for the build from source effort. If so, wouldn't the netstandard configurations be good enough for that? cc: @weshaggard

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I suppose these guys are here for the build from source effort. If so, wouldn't the netstandard configurations be good enough for that? cc: @weshaggard

Yes. That is why I'm adding netcoreapp as a build configuration:
#24719 (comment)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Anything in the shared framework should build against netcoreapp instead of netstandard.

<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp2.0'">
<ItemGroup Condition="$(TargetGroup.Contains('netcoreapp'))">

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Does this work on all msbuilds that we support? MSBuild 14.0, CLI? If so, perhaps we should do a pass in the future so that we make all the conditions be like this.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I built it locally and it worked by running build.cmd is that enough?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I expect that this works in all the msbuilds we support.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

MSBuild has had property functions since at least 2010.

<ProjectReference Include="..\src\System.IO.Ports.csproj" />
</ItemGroup>
<ItemGroup>
<InboxOnTargetFramework Include="$(UAPvNextTFM)" />

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why was this removed?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Because it was duplicated, it is right above before the project reference. It was just a cleanup

@@ -0,0 +1 @@
advapi32.dll!LsaNtStatusToWinError No newline at end of file

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why does this need baselined?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

The .netcoreapp2.0 was part of the filename.

Note this is legal in UWP RS3 so we could arguably add it to our OneCore baseline depending on how far back we support OneCore. I have never updated that baseline. For now exclusion is fine.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yes. Since we are building for netcoreapp2.0 and netcoreapp I added the netcoreapp exclusion since the other one is explicit to netcoreapp2.0. I was thinking of also removing the netcoreapp part but that would add the exclusion for all the other frameworks.

@weshaggard weshaggard left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

A couple questions otherwise looks good.

@safern
safern merged commit 39cdb93 into dotnet:master Nov 3, 2017
@safern
safern deleted the StabilizeConfigurationsForCompatPack branch November 3, 2017 18:41
@safern

safern commented Nov 3, 2017

Copy link
Copy Markdown
Member Author

Thanks for the reviews :)

@karelz karelz added this to the 2.1.0 milestone Nov 18, 2017
Dotnet-GitSync-Bot pushed a commit to Dotnet-GitSync-Bot/corefx that referenced this pull request Jul 12, 2019
…sions (dotnet#25017)

* Address last nullable feedback from System.Runtime

* Address nullable feedback for System.Runtime.Extensions

* PR Feedback

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
stephentoub pushed a commit that referenced this pull request Jul 12, 2019
…sions (#25017)

* Address last nullable feedback from System.Runtime

* Address nullable feedback for System.Runtime.Extensions

* PR Feedback

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
* Stabilize configurations for Microsoft.Win32.Registry

* Stabilize configurations for System.IO.FileSystem.AccessControl

* Stabilize configurations for System.IO.Packaging

* Stabilize configurations for System.Security.AccessControl

* Stabilize configurations for System.Principal.Windows

* Stabilize configurations for System.ServiceProcess.ServiceController

* Stabilize configurations for System.Text.Encoding.CodePages

* Some extra cleanup

* Fix CI failures


Commit migrated from dotnet/corefx@39cdb93
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants