mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Edits per code review

Browse source
This commit is contained in:
Michael Simons 2021-10-21 04:32:21 +00:00
parent d2e491a787
commit 544f720d0c
2 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build-to-suppor.patch → src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch
View file

@ -1,9 +1,11 @@
From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001 From b7f0c8d910b5fa110be7f34816c4934f61643d08 Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com> From: Chris Rummel <crummel@microsoft.com>
Date: Wed, 20 Oct 2021 15:19:29 -0500 Date: Wed, 20 Oct 2021 15:19:29 -0500
Subject: [PATCH] Restore building all TFMs for source-build to support NuGet Subject: [PATCH] Restore building all TFMs for source-build
to support templating.
Required for omnisharp, nuget-client, templating
Background Issue: https://github.com/dotnet/source-build/issues/2542
--- ---
src/Directory.Build.props | 3 +-- src/Directory.Build.props | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-) 1 file changed, 1 insertion(+), 2 deletions(-)

19
src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch
View file

@ -3,15 +3,17 @@ From: dseefeld <dseefeld@microsoft.com>
Date: Wed, 20 Oct 2021 21:49:51 +0000 Date: Wed, 20 Oct 2021 21:49:51 +0000
Subject: [PATCH] Remove dependency on MS.VS.Setup.Configuration.Interop Subject: [PATCH] Remove dependency on MS.VS.Setup.Configuration.Interop
Removes prebuilts.
Background Issue: https://github.com/dotnet/source-build/issues/2542
--- ---
eng/Packages.props | 3 --- eng/Packages.props | 3 ---
src/Build/Microsoft.Build.csproj | 4 +++- src/Build/Microsoft.Build.csproj | 4 +++-
src/Directory.BeforeCommon.targets | 2 +- src/Directory.BeforeCommon.targets | 2 +-
src/Samples/Directory.Build.props | 1 + src/Samples/Directory.Build.props | 1 +
src/Samples/Directory.Build.targets | 2 +-
src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++- src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++-
src/Utilities/Microsoft.Build.Utilities.csproj | 2 +- src/Utilities/Microsoft.Build.Utilities.csproj | 2 +-
7 files changed, 10 insertions(+), 8 deletions(-) 6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/eng/Packages.props b/eng/Packages.props diff --git a/eng/Packages.props b/eng/Packages.props
index 2de607c5d..1668addc9 100644 index 2de607c5d..1668addc9 100644
@ -68,19 +70,6 @@ index 6b9d6cd9f..317ef14a6 100644
</PropertyGroup> </PropertyGroup>
<!-- Import parent props --> <!-- 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 diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj
index d8f81bf99..3a5514094 100644 index d8f81bf99..3a5514094 100644
--- a/src/Tasks/Microsoft.Build.Tasks.csproj --- a/src/Tasks/Microsoft.Build.Tasks.csproj