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

Jump to bottom

Update Microsoft.Build.* SDKs #83877

Merged
merged 4 commits into from
Mar 24, 2023
Merged

Update Microsoft.Build.* SDKs #83877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f42713b
Update Microsoft.Build.* SDKs
ViktorHofer Mar 24, 2023
d8a012c
Delete NoTargetsSdk.AfterTargets.targets
ViktorHofer Mar 24, 2023
12ab2ae
Update Directory.Build.props
ViktorHofer Mar 24, 2023
13e2f01
Update NoTargetsSdk.BeforeTargets.targets
ViktorHofer Mar 24, 2023
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 Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,6 @@

<PropertyGroup>
<CustomBeforeNoTargets>$(RepositoryEngineeringDir)NoTargetsSdk.BeforeTargets.targets</CustomBeforeNoTargets>
<CustomAfterNoTargets>$(RepositoryEngineeringDir)NoTargetsSdk.AfterTargets.targets</CustomAfterNoTargets>
<CustomAfterTraversalTargets>$(RepositoryEngineeringDir)TraversalSdk.AfterTargets.targets</CustomAfterTraversalTargets>
</PropertyGroup>
</Project>
7 changes: 0 additions & 7 deletions eng/NoTargetsSdk.AfterTargets.targets
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions eng/NoTargetsSdk.BeforeTargets.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project>

<PropertyGroup>
<!-- NoTargets SDK shouldn't copy files into the intermediate/output directory. -->
<SkipCopyFilesMarkedCopyLocal>true</SkipCopyFilesMarkedCopyLocal>
<!-- NoTargets SDK needs a TFM set. Set a default if the project doesn't multi target. -->
<TargetFramework Condition="'$(TargetFramework)' == '' and '$(TargetFrameworks)' == ''">$(NetCoreAppCurrent)</TargetFramework>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23172.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23172.2",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23172.2",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-preview.3.23162.2"
}
}