-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Fix toolset package failing to build from clean state in VS #78251
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,17 +13,18 @@ | |
|
|
||
| This package is primarily intended as a method for rapidly shipping hotfixes to customers. Using it as a long term solution for providing newer compilers on older MSBuild installations is explicitly not supported. That can and will break on a regular basis. | ||
|
|
||
| The supported mechanism for providing new compilers in a build enviroment is updating to the newer .NET SDK or Visual Studio Build Tools SKU. | ||
| The supported mechanism for providing new compilers in a build environment is updating to the newer .NET SDK or Visual Studio Build Tools SKU. | ||
|
|
||
| This package requires either MSBuild 16.3 and .NET Desktop 4.7.2+ or .NET Core 2.1+ | ||
|
|
||
| $(RoslynPackageDescriptionDetails) | ||
| </PackageDescription> | ||
| <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFiles</TargetsForTfmSpecificContentInPackage> | ||
| <!-- Remove NU5128 once https://github.com/NuGet/Home/issues/8583 is fixed --> | ||
| <NoWarn>$(NoWarn);NU5100;NU5128</NoWarn> | ||
|
|
||
| <_DependsOn Condition="'$(TargetFramework)' == 'net472'">InitializeDesktopCompilerArtifacts</_DependsOn> | ||
| <_DependsOn Condition="'$(TargetFramework)' != 'net472'">InitializeCoreClrCompilerArtifacts</_DependsOn> | ||
| <_InitializeArtifactsTargetName Condition="'$(TargetFramework)' == 'net472'">InitializeDesktopCompilerArtifacts</_InitializeArtifactsTargetName> | ||
| <_InitializeArtifactsTargetName Condition="'$(TargetFramework)' != 'net472'">InitializeCoreClrCompilerArtifacts</_InitializeArtifactsTargetName> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
|
|
@@ -46,7 +47,7 @@ | |
| <Content Include="buildMultiTargeting\**\*.*" PackagePath="buildMultiTargeting\" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="_GetFiles" AfterTargets="Build" DependsOnTargets="$(_DependsOn)" Condition="'$(TargetFramework)' != ''"> | ||
| <Target Name="_GetFiles" DependsOnTargets="$(_InitializeArtifactsTargetName);Build"> | ||
| <ItemGroup> | ||
| <_File Include="@(DesktopCompilerArtifact)" TargetDir="tasks/net472"/> | ||
| <_File Include="@(DesktopCompilerResourceArtifact)" TargetDir="tasks/net472"/> | ||
|
|
@@ -61,7 +62,8 @@ | |
| <TfmSpecificPackageFile Include="@(_FileWithPath)" PackagePath="%(_FileWithPath.TargetPath)" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Used for debugging parts of the toolset (e.g., build tasks). --> | ||
| <!-- Used for debugging parts of the toolset (e.g., build tasks). | ||
| Doesn't work in VS (where `<ProjectReference Targets="Publish" />` doesn't have any effect), hence we set `ContinueOnError="true"`. --> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. D'oh I forgot to delete this comment. |
||
| <Copy SourceFiles="@(_FileWithPath)" | ||
| DestinationFiles="$(BaseOutputPath)$(Configuration)\%(_FileWithPath.TargetPath)" | ||
| SkipUnchangedFiles="true" /> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not that there was any doubt, but I did a
git blameand yeah this was my fault.