diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj index 11bc975dd42..e6c0820a60a 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj @@ -133,20 +133,19 @@ <_CommonProps Include="VCTargetsPath=$([MSBuild]::ValueOrDefault('$(VCTargetsPath)', '$([MSBuild]::GetVsInstallRoot())\Common7\IDE\VC\VCTargets\'))" Condition="'$(MSBuildRuntimeType)' != 'Core'"/> - - <_RestoreToolsProps Include="@(_CommonProps)"/> - <_RestoreToolsProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)Common"/> - <_RestoreToolsProps Include="ExcludeRestorePackageImports=true"/> - <_RestoreToolsProps Include="_NuGetRestoreTargets=$(_NuGetRestoreTargets)"/> + + <_CommonToolsProps Include="@(_CommonProps)"/> + <_CommonToolsProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)Common"/> + <_CommonToolsProps Include="_NuGetRestoreTargets=$(_NuGetRestoreTargets)"/> - <_RestoreToolsProps Include="Publish=$(Publish)"/> + <_CommonToolsProps Include="Publish=$(Publish)"/> - <_RestoreToolsProps Include="PublishToSymbolServer=$(PublishToSymbolServer)"/> + <_CommonToolsProps Include="PublishToSymbolServer=$(PublishToSymbolServer)"/> - <_RestoreToolsProps Include="DotNetPublishUsingPipelines=$(DotNetPublishUsingPipelines)"/> + <_CommonToolsProps Include="DotNetPublishUsingPipelines=$(DotNetPublishUsingPipelines)"/> - <_RestoreToolsProps Include="DotNetRuntimeSourceFeed=$(DotNetRuntimeSourceFeed)"/> - <_RestoreToolsProps Include="DotNetRuntimeSourceFeedKey=$(DotNetRuntimeSourceFeedKey)"/> + <_CommonToolsProps Include="DotNetRuntimeSourceFeed=$(DotNetRuntimeSourceFeed)"/> + <_CommonToolsProps Include="DotNetRuntimeSourceFeedKey=$(DotNetRuntimeSourceFeedKey)"/> + + + + <_RestoreToolsProps Include="@(_CommonToolsProps)"/> + <_RestoreToolsProps Include="ExcludeRestorePackageImports=true"/> + + + + + + + + + + + <_CommonProps Include="@(_RestoreToolsOutput->'NuGetPackageRoot=%(Identity)')"/> @@ -177,14 +199,6 @@ <_SolutionBuildProps Include="__ImportPackTargets=true" Condition="'$(Pack)' == 'true'" /> - - - + + + + diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Microsoft.Build.NoTargets.3.7.56.Sdk.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Microsoft.Build.NoTargets.3.7.56.Sdk.props new file mode 100644 index 00000000000..945ada3e5d2 --- /dev/null +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Microsoft.Build.NoTargets.3.7.56.Sdk.props @@ -0,0 +1,81 @@ + + + + + + + true + $(MSBuildAllProjects);$(MsBuildThisFileFullPath) + + + + + true + true + true + + + + + + + false + false + + + PackageReference + + + true + + + false + false + + + false + + + false + + + false + + + true + + + false + false + true + + + true + + + + + + false + true + + + + + + + + + + + + diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Microsoft.Build.NoTargets.3.7.56.Sdk.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Microsoft.Build.NoTargets.3.7.56.Sdk.targets new file mode 100644 index 00000000000..94ea814bf1e --- /dev/null +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Microsoft.Build.NoTargets.3.7.56.Sdk.targets @@ -0,0 +1,107 @@ + + + + + + + + $(MSBuildToolsPath)\Microsoft.Common.targets + $(MSBuildAllProjects);$(MsBuildThisFileFullPath) + + + + + + + false + + + $(CustomBeforeMicrosoftCommonTargets);$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.Managed.DesignTime.targets + + + + + + + + BuildOnlySettings; + PrepareForBuild; + PreBuildEvent; + ResolveReferences; + Compile; + GetTargetPath; + PrepareForRun; + IncrementalClean; + PostBuildEvent + + + + None + false + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj index 618af66f7d3..438065e41c5 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj @@ -1,13 +1,15 @@ + + net472 - 5 + v4.7.2 .NETFramework .NETFramework,Version=v4.7.2 $(BaseIntermediateOutputPath) @@ -86,6 +88,10 @@ Condition="'$(Restore)' == 'true'"/> + + + + @@ -97,4 +103,6 @@ + +