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

Add configurations for additional targeting packs - #15520

Merged
ericstj merged 1 commit into
dotnet:masterfrom
ericstj:addTargetingPacks
Jan 26, 2017
Merged

Add configurations for additional targeting packs#15520
ericstj merged 1 commit into
dotnet:masterfrom
ericstj:addTargetingPacks

Conversation

@ericstj

@ericstj ericstj commented Jan 26, 2017

Copy link
Copy Markdown
Member

This enables us to build against additional desktop and netstandard
versions.

/cc @weshaggard @joperezr @tarekgh

This enables us to build against additional desktop and netstandard
versions.
<!-- Include netcoreapp since we need to generate facades between desktop and netcoreapp -->
<BuildConfigurations>
net45;
net451;

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.

do we really need to have net45x in general?

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.

We did before. Some facades were being built against this for the API versions that target netstandard1.1 or lower.

@tarekgh

tarekgh commented Jan 26, 2017

Copy link
Copy Markdown
Member

LGTM

@ericstj
ericstj merged commit 14ea81b into dotnet:master Jan 26, 2017
</PropertyGroup>
<PropertyGroup Condition="'$(TargetGroup)' == 'net463'">
<!-- Missing 4.6.3 targeting pack, use 462 for now -->
<TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.2</TargetingPackNugetPackageId>

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 see you are now making use of TargetingPackNugetPackageId I was planning to clean that out, but I guess I will leave it alone now.

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.

You can clean it out if you want to and just move it to these projects.

"{TFM}": {
"dependencies": {
"NETStandard.Library": "2.0.0-beta-24919-01",
"System.Diagnostics.Contracts": "4.3.0"

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.

What is the reason for the different template for 1.x? The only difference appears to be this System.Diagnostics.Contracts package. Are you working around some issue?

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.

This is where we pull in additional NETStandard1.x packages that are needed by our libraries that aren't part of the NETStandard.Library package. So far all I've needed is this guy, we might need more.

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.

We can probably get away with sharing the same template and just having a poor mans version of your conflict resolution in the project.

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 don't like it because that means a vertical build will download packages from NuGet. I separated it so that we wouldn't download anything we didn't build in another repo for a vertical build.

<OutputPath>$(RefRootPath)/$(TargetGroup)</OutputPath>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Target Name="FilterTargetingPackResolvedNugetPackages" />

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 do we need the empty filter target?

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 I don't want any filtering. Without this I was only getting mscorlib. Perhaps there's a better way to do this if we update the filtering target but I didn't see a good hook, and I didn't want to list out every assembly. We might want to do the same for the desktop targeting packs, then move your shim list into shims.proj. /cc @tarekgh

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 see yeah we should probably remove this filtering completely and switch to the other package filtering that @tarekgh created.

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.

That's a good suggestion. I forgot about that.

@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.

LGTM

@karelz karelz modified the milestone: 2.0.0 Feb 4, 2017
dotnet-bot pushed a commit that referenced this pull request Jan 13, 2018
)

* Change ReadOnlySpan indexer to return ref readonly.

Update JIT to handle changes to ReadOnlySpan indexer

Resolving merge conflict and fixing jit importer

Update ReadOnlySpan Enumerator Current to use indexer.

Removing readonly keyword.

* Temporarily disabling Span perf and other tests that use ReadOnlySpan

* Isolating the ref readonly indexer change only to CoreCLR for now.

Reverting the change to Enumerator Current for now

Fix file formatting

Enable Alpine CI (#15502)

* Enable Alpine CI

This enables Alpine CI leg on every PR using the pipelines.

compare type size instead of var_types

get rid of TYP_CHAR

Adding support for Acosh, Asinh, Atanh, and Cbrt to Math and MathF

Updating the PAL layer to support acosh, asinh, atanh, and cbrt

Adding some PAL tests for acosh, asinh, atanh, and cbrt

Adding valuenum support for acosh, asinh, atanh, and cbrt

Lsra Documentation

Update LinearScan section of ryujit-overview.md, and add lsra-detail.md

Refactor Unsafe.cs to get it more in sync with CoreRT. (#15510)

* Refactor Unsafe.cs to get it more in sync with CoreRT.

* Format the document.

* Unifying the copies of Unsafe using ifdefs

* Change exception thrown to PlatformNotSupportedException

* Addressing PR feedback and moving Unsafe to shared.

* Addressing PR feedback

* Addressing PR review - adding intrinsic attribute

Update CoreClr, CoreFx to preview1-26014-01, preview1-26013-12, respectively (#15513)

Revert "Add optional integer offset to OwnedMemory Pin (#15410)"

This reverts commit 8931cfa.

Get rid of old -altjitcrossgen argument now that CI has been updated

Merge pull request dotnet/corert#5109 from dotnet/nmirror (#15518)

Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

Revert " Revert "[Local GC] Move knowledge of overlapped I/O objects to the EE through four callbacks (#14982)""

Fix typo `_TARGET_ARM` to `_TARGET_ARM_`. This happens mostly in comments except lsra.cpp.

Update CoreClr, CoreFx, PgoData to preview1-26014-04, preview1-26014-03, master-20171214-0043, respectively (#15520)

* Disabling a test that uses ReadOnlySpan indexer

* Temporarily disabling the superpmi test and fixing nit

* Remove debug statements.
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
dotnet-bot pushed a commit that referenced this pull request Jan 13, 2018
)

* Change ReadOnlySpan indexer to return ref readonly.

Update JIT to handle changes to ReadOnlySpan indexer

Resolving merge conflict and fixing jit importer

Update ReadOnlySpan Enumerator Current to use indexer.

Removing readonly keyword.

* Temporarily disabling Span perf and other tests that use ReadOnlySpan

* Isolating the ref readonly indexer change only to CoreCLR for now.

Reverting the change to Enumerator Current for now

Fix file formatting

Enable Alpine CI (#15502)

* Enable Alpine CI

This enables Alpine CI leg on every PR using the pipelines.

compare type size instead of var_types

get rid of TYP_CHAR

Adding support for Acosh, Asinh, Atanh, and Cbrt to Math and MathF

Updating the PAL layer to support acosh, asinh, atanh, and cbrt

Adding some PAL tests for acosh, asinh, atanh, and cbrt

Adding valuenum support for acosh, asinh, atanh, and cbrt

Lsra Documentation

Update LinearScan section of ryujit-overview.md, and add lsra-detail.md

Refactor Unsafe.cs to get it more in sync with CoreRT. (#15510)

* Refactor Unsafe.cs to get it more in sync with CoreRT.

* Format the document.

* Unifying the copies of Unsafe using ifdefs

* Change exception thrown to PlatformNotSupportedException

* Addressing PR feedback and moving Unsafe to shared.

* Addressing PR feedback

* Addressing PR review - adding intrinsic attribute

Update CoreClr, CoreFx to preview1-26014-01, preview1-26013-12, respectively (#15513)

Revert "Add optional integer offset to OwnedMemory Pin (#15410)"

This reverts commit 8931cfa.

Get rid of old -altjitcrossgen argument now that CI has been updated

Merge pull request dotnet/corert#5109 from dotnet/nmirror (#15518)

Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

Revert " Revert "[Local GC] Move knowledge of overlapped I/O objects to the EE through four callbacks (#14982)""

Fix typo `_TARGET_ARM` to `_TARGET_ARM_`. This happens mostly in comments except lsra.cpp.

Update CoreClr, CoreFx, PgoData to preview1-26014-04, preview1-26014-03, master-20171214-0043, respectively (#15520)

* Disabling a test that uses ReadOnlySpan indexer

* Temporarily disabling the superpmi test and fixing nit

* Remove debug statements.
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
safern pushed a commit that referenced this pull request Jan 16, 2018
)

* Change ReadOnlySpan indexer to return ref readonly.

Update JIT to handle changes to ReadOnlySpan indexer

Resolving merge conflict and fixing jit importer

Update ReadOnlySpan Enumerator Current to use indexer.

Removing readonly keyword.

* Temporarily disabling Span perf and other tests that use ReadOnlySpan

* Isolating the ref readonly indexer change only to CoreCLR for now.

Reverting the change to Enumerator Current for now

Fix file formatting

Enable Alpine CI (#15502)

* Enable Alpine CI

This enables Alpine CI leg on every PR using the pipelines.

compare type size instead of var_types

get rid of TYP_CHAR

Adding support for Acosh, Asinh, Atanh, and Cbrt to Math and MathF

Updating the PAL layer to support acosh, asinh, atanh, and cbrt

Adding some PAL tests for acosh, asinh, atanh, and cbrt

Adding valuenum support for acosh, asinh, atanh, and cbrt

Lsra Documentation

Update LinearScan section of ryujit-overview.md, and add lsra-detail.md

Refactor Unsafe.cs to get it more in sync with CoreRT. (#15510)

* Refactor Unsafe.cs to get it more in sync with CoreRT.

* Format the document.

* Unifying the copies of Unsafe using ifdefs

* Change exception thrown to PlatformNotSupportedException

* Addressing PR feedback and moving Unsafe to shared.

* Addressing PR feedback

* Addressing PR review - adding intrinsic attribute

Update CoreClr, CoreFx to preview1-26014-01, preview1-26013-12, respectively (#15513)

Revert "Add optional integer offset to OwnedMemory Pin (#15410)"

This reverts commit 8931cfa.

Get rid of old -altjitcrossgen argument now that CI has been updated

Merge pull request dotnet/corert#5109 from dotnet/nmirror (#15518)

Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

Revert " Revert "[Local GC] Move knowledge of overlapped I/O objects to the EE through four callbacks (#14982)""

Fix typo `_TARGET_ARM` to `_TARGET_ARM_`. This happens mostly in comments except lsra.cpp.

Update CoreClr, CoreFx, PgoData to preview1-26014-04, preview1-26014-03, master-20171214-0043, respectively (#15520)

* Disabling a test that uses ReadOnlySpan indexer

* Temporarily disabling the superpmi test and fixing nit

* Remove debug statements.
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
safern pushed a commit that referenced this pull request Jan 16, 2018
)

* Change ReadOnlySpan indexer to return ref readonly.

Update JIT to handle changes to ReadOnlySpan indexer

Resolving merge conflict and fixing jit importer

Update ReadOnlySpan Enumerator Current to use indexer.

Removing readonly keyword.

* Temporarily disabling Span perf and other tests that use ReadOnlySpan

* Isolating the ref readonly indexer change only to CoreCLR for now.

Reverting the change to Enumerator Current for now

Fix file formatting

Enable Alpine CI (#15502)

* Enable Alpine CI

This enables Alpine CI leg on every PR using the pipelines.

compare type size instead of var_types

get rid of TYP_CHAR

Adding support for Acosh, Asinh, Atanh, and Cbrt to Math and MathF

Updating the PAL layer to support acosh, asinh, atanh, and cbrt

Adding some PAL tests for acosh, asinh, atanh, and cbrt

Adding valuenum support for acosh, asinh, atanh, and cbrt

Lsra Documentation

Update LinearScan section of ryujit-overview.md, and add lsra-detail.md

Refactor Unsafe.cs to get it more in sync with CoreRT. (#15510)

* Refactor Unsafe.cs to get it more in sync with CoreRT.

* Format the document.

* Unifying the copies of Unsafe using ifdefs

* Change exception thrown to PlatformNotSupportedException

* Addressing PR feedback and moving Unsafe to shared.

* Addressing PR feedback

* Addressing PR review - adding intrinsic attribute

Update CoreClr, CoreFx to preview1-26014-01, preview1-26013-12, respectively (#15513)

Revert "Add optional integer offset to OwnedMemory Pin (#15410)"

This reverts commit 8931cfa.

Get rid of old -altjitcrossgen argument now that CI has been updated

Merge pull request dotnet/corert#5109 from dotnet/nmirror (#15518)

Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

Revert " Revert "[Local GC] Move knowledge of overlapped I/O objects to the EE through four callbacks (#14982)""

Fix typo `_TARGET_ARM` to `_TARGET_ARM_`. This happens mostly in comments except lsra.cpp.

Update CoreClr, CoreFx, PgoData to preview1-26014-04, preview1-26014-03, master-20171214-0043, respectively (#15520)

* Disabling a test that uses ReadOnlySpan indexer

* Temporarily disabling the superpmi test and fixing nit

* Remove debug statements.
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
Add configurations for additional targeting packs

Commit migrated from dotnet/corefx@14ea81b
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