Build msbuild for net472 and remove depdency on VS
This commit is contained in:
dseefeld
parent
dca28b2c52
commit
d2e491a787
2 changed files with 147 additions and 0 deletions
|
|
@ -0,0 +1,32 @@
|
|||
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
|
||||
|
||||
|
|
@ -0,0 +1,115 @@
|
|||
From a75f4b17c3595079f69ea00041182368adea14c9 Mon Sep 17 00:00:00 2001
|
||||
From: dseefeld <dseefeld@microsoft.com>
|
||||
Date: Wed, 20 Oct 2021 21:49:51 +0000
|
||||
Subject: [PATCH] Remove dependency on MS.VS.Setup.Configuration.Interop
|
||||
|
||||
---
|
||||
eng/Packages.props | 3 ---
|
||||
src/Build/Microsoft.Build.csproj | 4 +++-
|
||||
src/Directory.BeforeCommon.targets | 2 +-
|
||||
src/Samples/Directory.Build.props | 1 +
|
||||
src/Samples/Directory.Build.targets | 2 +-
|
||||
src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++-
|
||||
src/Utilities/Microsoft.Build.Utilities.csproj | 2 +-
|
||||
7 files changed, 10 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/eng/Packages.props b/eng/Packages.props
|
||||
index 2de607c5d..1668addc9 100644
|
||||
--- a/eng/Packages.props
|
||||
+++ b/eng/Packages.props
|
||||
@@ -46,9 +46,6 @@
|
||||
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/>
|
||||
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
|
||||
- </ItemGroup>
|
||||
-
|
||||
- <ItemGroup>
|
||||
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
|
||||
</ItemGroup>
|
||||
|
||||
diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
|
||||
index d08e337c5..3b173aee5 100644
|
||||
--- a/src/Build/Microsoft.Build.csproj
|
||||
+++ b/src/Build/Microsoft.Build.csproj
|
||||
@@ -38,8 +38,10 @@
|
||||
<PackageReference Include="System.Reflection.Metadata" Condition="'$(MonoBuild)' == 'true'" />
|
||||
</ItemGroup>
|
||||
|
||||
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildFromSource)' != 'true'">
|
||||
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
|
||||
+ </ItemGroup>
|
||||
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
<Reference Include="System.IO.Compression" />
|
||||
<PackageReference Include="System.Memory" />
|
||||
</ItemGroup>
|
||||
diff --git a/src/Directory.BeforeCommon.targets b/src/Directory.BeforeCommon.targets
|
||||
index 913c97b12..320bffa56 100644
|
||||
--- a/src/Directory.BeforeCommon.targets
|
||||
+++ b/src/Directory.BeforeCommon.targets
|
||||
@@ -99,7 +99,7 @@
|
||||
<DefineConstants>$(DefineConstants);FEATURE_DEBUGGER</DefineConstants>
|
||||
<DefineConstants Condition="'$(MachineIndependentBuild)' != 'true'">$(DefineConstants);FEATURE_WIN32_REGISTRY</DefineConstants>
|
||||
<DefineConstants>$(DefineConstants);FEATURE_WORKINGSET</DefineConstants>
|
||||
- <DefineConstants Condition="'$(MonoBuild)' != 'true' and '$(MachineIndependentBuild)' != 'true' and '$(TargetFrameworkVersion)' != 'v3.5'">$(DefineConstants);FEATURE_VISUALSTUDIOSETUP</DefineConstants>
|
||||
+ <DefineConstants Condition="'$(MonoBuild)' != 'true' and '$(MachineIndependentBuild)' != 'true' and '$(TargetFrameworkVersion)' != 'v3.5' and '$(DotNetBuildFromSource)' != 'true'">$(DefineConstants);FEATURE_VISUALSTUDIOSETUP</DefineConstants>
|
||||
<DefineConstants>$(DefineConstants);FEATURE_MSCOREE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props
|
||||
index 6b9d6cd9f..317ef14a6 100644
|
||||
--- a/src/Samples/Directory.Build.props
|
||||
+++ b/src/Samples/Directory.Build.props
|
||||
@@ -8,6 +8,7 @@
|
||||
<EnableCentralPackageVersions>false</EnableCentralPackageVersions>
|
||||
|
||||
<IsShipping>false</IsShipping>
|
||||
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Import parent props -->
|
||||
diff --git a/src/Samples/Directory.Build.targets b/src/Samples/Directory.Build.targets
|
||||
index 78b52aab8..db80eff4d 100644
|
||||
--- a/src/Samples/Directory.Build.targets
|
||||
+++ b/src/Samples/Directory.Build.targets
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all"/>
|
||||
- <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
|
||||
+ <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildFromSource)' != 'true'" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Import parent targets -->
|
||||
diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj
|
||||
index d8f81bf99..3a5514094 100644
|
||||
--- a/src/Tasks/Microsoft.Build.Tasks.csproj
|
||||
+++ b/src/Tasks/Microsoft.Build.Tasks.csproj
|
||||
@@ -999,8 +999,10 @@
|
||||
<PackageReference Include="Microsoft.Net.Compilers.Toolset" ExcludeAssets="all" Condition="'$(UsingToolMicrosoftNetCompilers)' == 'false'" />
|
||||
</ItemGroup>
|
||||
|
||||
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildFromSource)' != 'true'">
|
||||
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
|
||||
+ </ItemGroup>
|
||||
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
<PackageReference Include="System.Threading.Tasks.Dataflow" />
|
||||
|
||||
<Content Include="$(NuGetPackageRoot)microsoft.net.compilers.toolset\$(MicrosoftNetCompilersToolsetVersion)\tasks\net472\**\*" CopyToOutputDirectory="PreserveNewest" LinkBase="Roslyn" />
|
||||
diff --git a/src/Utilities/Microsoft.Build.Utilities.csproj b/src/Utilities/Microsoft.Build.Utilities.csproj
|
||||
index 09634e723..72d838d9d 100644
|
||||
--- a/src/Utilities/Microsoft.Build.Utilities.csproj
|
||||
+++ b/src/Utilities/Microsoft.Build.Utilities.csproj
|
||||
@@ -25,7 +25,7 @@
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager" />
|
||||
</ItemGroup>
|
||||
|
||||
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard'">
|
||||
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard' and '$(DotNetBuildFromSource)' != 'true'">
|
||||
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
|
||||
</ItemGroup>
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
Loading…
Add table
Reference in a new issue