Introduce temporary dependency from templating on NuGet to ensure it picks up the new fixed packages.
This commit is contained in:
parent
aab9a8b3a6
commit
2823ea21fb
2 changed files with 2 additions and 32 deletions
|
@ -16,6 +16,8 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RepositoryReference Include="clicommandlineparser" />
|
<RepositoryReference Include="clicommandlineparser" />
|
||||||
<RepositoryReference Include="source-build" />
|
<RepositoryReference Include="source-build" />
|
||||||
|
<!-- temporarily introduce an artificial reference so templating builds after our NuGet changes -->
|
||||||
|
<RepositoryReference Include="nuget-client" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Chris Rummel <crummel@microsoft.com>
|
|
||||||
Date: Wed, 20 Oct 2021 15:19:29 -0500
|
|
||||||
Subject: [PATCH] Restore building all TFMs for source-build to support NuGet
|
|
||||||
to support templating.
|
|
||||||
|
|
||||||
---
|
|
||||||
src/Directory.Build.props | 3 +--
|
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
|
|
||||||
index b0e233194..7e0c7d8c8 100644
|
|
||||||
--- a/src/Directory.Build.props
|
|
||||||
+++ b/src/Directory.Build.props
|
|
||||||
@@ -27,13 +27,12 @@
|
|
||||||
|
|
||||||
<!-- Defaults for target frameworks and architecture -->
|
|
||||||
<LibraryTargetFrameworks>$(FullFrameworkTFM);netstandard2.0</LibraryTargetFrameworks>
|
|
||||||
- <LibraryTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netstandard2.0</LibraryTargetFrameworks>
|
|
||||||
<LibraryTargetFrameworks Condition="'$(MonoBuild)'=='true'">$(FullFrameworkTFM)</LibraryTargetFrameworks>
|
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
|
||||||
|
|
||||||
<!-- Target frameworks for Exe and unit test projects (ie projects with runtime output) -->
|
|
||||||
<RuntimeOutputTargetFrameworks>net6.0</RuntimeOutputTargetFrameworks>
|
|
||||||
- <RuntimeOutputTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(DotNetBuildFromSource)' != 'true'">$(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks)</RuntimeOutputTargetFrameworks>
|
|
||||||
+ <RuntimeOutputTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks)</RuntimeOutputTargetFrameworks>
|
|
||||||
<RuntimeOutputTargetFrameworks Condition="'$(MonoBuild)' == 'true'">$(FullFrameworkTFM)</RuntimeOutputTargetFrameworks>
|
|
||||||
|
|
||||||
<!-- Don't automatically append target framework to output path, since we want to put the Platform Target beforehand, if it's not AnyCPU -->
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue