Skip to content

Add CLI to known-good #418

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

Merged
merged 9 commits into from
Apr 16, 2018
Merged

Add CLI to known-good #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb9ca59
Add CLI to known-good, fix args
dagood Apr 11, 2018
a61a2f0
nuget-client workaround: build NuGet.Configuration
dagood Apr 12, 2018
e8318d6
symreader[-portable] workaround: revert pkg update
dagood Apr 12, 2018
2aeedc5
Add CLI workarounds
dagood Apr 13, 2018
de9c6bd
Double offline build timeout
dagood Apr 13, 2018
2cfe24b
Build MSBuild 15.1.9999 to ensure it's used in PVP
dagood Apr 13, 2018
a184e0b
Convert forks to patches
dagood Apr 13, 2018
043a6ab
Move setJobTimeout after standardJobSetup
dagood Apr 13, 2018
009da49
Always build portable runtime on OSX
dagood Apr 15, 2018
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
7 changes: 6 additions & 1 deletion dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@
<ArmEnvironmentVariables Condition="'$(Platform)' == 'armel'">ROOTFS_DIR=$(BaseIntermediatePath)crossrootfs/armel</ArmEnvironmentVariables>
</PropertyGroup>

<Import Project="$(TargetInfoProps)" Condition="$(GeneratingStaticPropertiesFile) != 'true' AND Exists('$(TargetInfoProps)')" />
<Import Project="$(TargetInfoProps)" Condition="$(GeneratingStaticPropertiesFile) != 'true' AND Exists('$(TargetInfoProps)')" />

<PropertyGroup>
<!-- Always build portable runtime on OSX to match the CLI repo's filename expectations. https://github.com/dotnet/source-build/issues/438 -->
<PortableBuild Condition="'$(TargetOS)' == 'OSX'">true</PortableBuild>
</PropertyGroup>

<Import Project="$(ProjectDir)dependencies.props" />

Expand Down
3 changes: 3 additions & 0 deletions netci.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ def addPushJob(String project, String branch, String os, String configuration)

Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}");

// Increase timeout. The offline build in Docker takes more than 2 hours.
Utilities.setJobTimeout(newJob, 240);

// Clone into the source-build directory
Utilities.addScmInSubDirectory(newJob, project, isPR, 'source-build');
if(isPR){
Expand Down
98 changes: 98 additions & 0 deletions patches/cli/0001-Use-netcoreapp2.0-for-build-framework-else-2.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
From 06b3a5c323acbd5cc300f63c87a4f2be35d2d987 Mon Sep 17 00:00:00 2001
From: Davis Goodin <[email protected]>
Date: Wed, 11 Apr 2018 14:25:27 -0500
Subject: [PATCH] Use netcoreapp2.0 for build framework, else 2.1

Pass NETCoreAppMaximumVersion through everywhere to allow 2.1.101 tooling to build netcoreapp2.1.

Make the dotnet-cli-build project use netcoreapp2.0 so it can run using the assemblies that 2.1.101 loads. Otherwise, System.Runtime mismatches.
---
build.proj | 3 ++-
build/Prepare.targets | 5 +++--
build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 4 ++--
src/redist/redist.csproj | 3 ++-
4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.proj b/build.proj
index fb895d191..6bbedfabc 100644
--- a/build.proj
+++ b/build.proj
@@ -20,7 +20,7 @@
DependsOnTargets="MSBuildWorkaroundTarget;
RestoreDotnetCliBuildFramework">

- <Exec Command="$(PreviousStageDotnet) publish --no-restore -o $(DotnetCliBuildDirectory)/bin --framework $(CliTargetFramework) /p:GeneratePropsFile=$(GeneratePropsFile)"
+ <Exec Command="$(PreviousStageDotnet) publish --no-restore -o $(DotnetCliBuildDirectory)/bin --framework netcoreapp2.0 /p:GeneratePropsFile=$(GeneratePropsFile) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)"
WorkingDirectory="$(DotnetCliBuildDirectory)"/>
</Target>

@@ -37,6 +37,7 @@

<PropertyGroup>
<ExtraRestoreArgs>$(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile)</ExtraRestoreArgs>
+ <ExtraRestoreArgs>$(ExtraRestoreArgs) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)</ExtraRestoreArgs>
<ExtraRestoreArgs Condition="'$(OS)' != 'Windows_NT'">$(ExtraRestoreArgs) --disable-parallel</ExtraRestoreArgs>
</PropertyGroup>

diff --git a/build/Prepare.targets b/build/Prepare.targets
index 2783c8214..4a5745b88 100644
--- a/build/Prepare.targets
+++ b/build/Prepare.targets
@@ -63,7 +63,8 @@
<CallTarget Targets="CleanSrcLockFiles" />

<DotNetRestore ToolPath="$(PreviousStageDirectory)"
- ProjectPath="&quot;%(RestoreSrcPackagesInput.FullPath)&quot;" />
+ ProjectPath="&quot;%(RestoreSrcPackagesInput.FullPath)&quot;"
+ AdditionalParameters="/p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)" />

</Target>

@@ -89,7 +90,7 @@

<DotNetRestore ToolPath="$(PreviousStageDirectory)"
ProjectPath="&quot;%(RestoreToolsPackagesInput.FullPath)&quot;"
- AdditionalParameters="/p:UsePortableLinuxSharedFramework=$(UsePortableLinuxSharedFramework)" />
+ AdditionalParameters="/p:UsePortableLinuxSharedFramework=$(UsePortableLinuxSharedFramework) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)" />

</Target>

diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
index bd7badca8..f57978e05 100644
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Build scripts for dotnet-cli</Description>
<VersionPrefix>1.0.0</VersionPrefix>
- <TargetFramework>$(CliTargetFramework)</TargetFramework>
+ <TargetFramework>netcoreapp2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>bin\$(Configuration)</OutputPath>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback>
@@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
- <PackageReference Include="Microsoft.NETCore.App" Version="2.1.0-preview1-26116-04" />
+ <PackageReference Include="Microsoft.NETCore.App" Version="2.0.6" />
<PackageReference Include="Microsoft.Build" Version="15.4.8" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.4.8" />
<PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index bc22fcf3f..7f6473ff5 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -85,7 +85,8 @@

<DotNetPublish ToolPath="$(PreviousStageDirectory)"
Configuration="$(Configuration)"
- ProjectPath="$(SrcDirectory)/tool_fsharp/tool_fsc.csproj" />
+ ProjectPath="$(SrcDirectory)/tool_fsharp/tool_fsc.csproj"
+ MSBuildArgs="/p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)" />
</Target>

<Target Name="GenerateCliRuntimeConfigurationFiles"
--
2.16.1.windows.4

100 changes: 100 additions & 0 deletions patches/cli/0002-Make-BuildFromSource-disable-ASP.NET-dev-certs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
From cd96ec40e18bf5cdce6cb3aad8b699051da7bf34 Mon Sep 17 00:00:00 2001
Copy link

@peterhuene peterhuene Apr 13, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should also patch this:

        private bool ShouldGenerateAspNetCertificate()
        {
#if DOTNET_BUILD_FROM_SOURCE
            return false;
#else
            var generateAspNetCertificate =
                _environmentProvider.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", true);

            return ShouldRunFirstRunExperience() &&
                generateAspNetCertificate &&
                !_aspNetCertificateSentinel.Exists();
#endif
        }

to prevent the first run experience from telling users a certificate was created when one wasn't.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed #434 to get this in.

From: Davis Goodin <[email protected]>
Date: Wed, 11 Apr 2018 14:27:25 -0500
Subject: [PATCH] Make BuildFromSource disable ASP.NET dev certs

Conditional on package restore plus a very rough #if that removes the using and call.
---
build/BundledRuntimes.props | 6 +++---
src/dotnet/AspNetCoreCertificateGenerator.cs | 5 +++++
src/dotnet/dotnet.csproj | 5 ++++-
3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 1bf1db059..cbb656fd0 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -55,7 +55,7 @@

<ItemGroup>
<_DownloadAndExtractItem Include="AspNetCoreSharedFxArchiveFile"
- Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And !$(Architecture.StartsWith('arm'))">
+ Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And !$(Architecture.StartsWith('arm')) And '$(IncludeAspNetCoreRuntime)' != 'false'">
<Url>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<DownloadFileName>$(AspNetCoreSharedFxArchiveFile)</DownloadFileName>
<ExtractDestination>$(AspNetCoreSharedFxPublishDirectory)</ExtractDestination>
@@ -97,14 +97,14 @@
</_DownloadAndExtractItem>

<_DownloadAndExtractItem Include="DownloadedAspNetCoreSharedFxInstallerFile"
- Condition="'$(SkipBuildingInstallers)' != 'true' AND '$(DownloadedAspNetCoreSharedFxInstallerFile)' != '' AND !Exists($(DownloadedAspNetCoreSharedFxInstallerFile)) And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+ Condition="'$(SkipBuildingInstallers)' != 'true' AND '$(DownloadedAspNetCoreSharedFxInstallerFile)' != '' AND !Exists($(DownloadedAspNetCoreSharedFxInstallerFile)) And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm')) And '$(IncludeAspNetCoreRuntime)' != 'false'">
<Url>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(DownloadedAspNetCoreSharedFxInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<DownloadFileName>$(DownloadedAspNetCoreSharedFxInstallerFile)</DownloadFileName>
<ExtractDestination></ExtractDestination>
</_DownloadAndExtractItem>

<_DownloadAndExtractItem Include="AspNetCoreSharedFxBaseRuntimeVersionFile"
- Condition="!Exists('$(AspNetCoreSharedFxBaseRuntimeVersionFile)') And !$(Architecture.StartsWith('arm'))">
+ Condition="!Exists('$(AspNetCoreSharedFxBaseRuntimeVersionFile)') And !$(Architecture.StartsWith('arm')) And '$(IncludeAspNetCoreRuntime)' != 'false'">
<Url>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxBaseRuntimeVersionFileName)$(CoreSetupBlobAccessTokenParam)</Url>
<DownloadFileName>$(AspNetCoreSharedFxBaseRuntimeVersionFile)</DownloadFileName>
<ExtractDestination></ExtractDestination>
diff --git a/src/dotnet/AspNetCoreCertificateGenerator.cs b/src/dotnet/AspNetCoreCertificateGenerator.cs
index d0fcf0a9a..f4930e22e 100644
--- a/src/dotnet/AspNetCoreCertificateGenerator.cs
+++ b/src/dotnet/AspNetCoreCertificateGenerator.cs
@@ -1,7 +1,10 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

+#if !DOTNET_BUILD_FROM_SOURCE
using Microsoft.AspNetCore.DeveloperCertificates.XPlat;
+#endif
+
using Microsoft.DotNet.Configurer;

namespace Microsoft.DotNet.Cli
@@ -10,7 +13,9 @@ public class AspNetCoreCertificateGenerator : IAspNetCoreCertificateGenerator
{
public void GenerateAspNetCoreDevelopmentCertificate()
{
+#if !DOTNET_BUILD_FROM_SOURCE
CertificateGenerator.GenerateAspNetHttpsCertificate();
+#endif
}
}
}
diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj
index b7d26a073..1912eece2 100644
--- a/src/dotnet/dotnet.csproj
+++ b/src/dotnet/dotnet.csproj
@@ -9,6 +9,7 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<AssetTargetFallback>dotnet5.4</AssetTargetFallback>
<RootNamespace>Microsoft.DotNet.Cli</RootNamespace>
+ <DefineConstants Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(DefineConstants);DOTNET_BUILD_FROM_SOURCE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Remove="commands\dotnet-new\**" />
@@ -60,7 +61,6 @@
<PackageReference Include="System.Diagnostics.TextWriterTraceListener" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Private.DataContractSerialization" Version="4.3.0" />
- <PackageReference Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.3.0" />
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
@@ -75,6 +75,9 @@
<PackageReference Include="Microsoft.DotNet.Archive" Version="$(MicrosoftDotNetArchivePackageVersion)" />
<PackageReference Include="XliffTasks" Version="$(XliffTasksPackageVersion)" PrivateAssets="All" />
</ItemGroup>
+ <ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' ">
+ <PackageReference Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(AspNetCoreVersion)" />
+ </ItemGroup>
<ItemGroup>
<Folder Include="commands\dotnet-migrate\xlf" />
<Folder Include="dotnet-complete\commands\" />
--
2.16.1.windows.4

114 changes: 114 additions & 0 deletions patches/cli/0003-Use-Repo-API-restore-sources-dependency-upgrade.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
From dacfcb5777443051ee656431b5fcd79aa10c3824 Mon Sep 17 00:00:00 2001
From: Davis Goodin <[email protected]>
Date: Wed, 11 Apr 2018 14:28:53 -0500
Subject: [PATCH] Use Repo API restore sources, dependency upgrade

---
build.proj | 3 ++-
build/InitRepo.props | 1 +
build/NugetConfigFile.targets | 12 ++++++++----
build/Prepare.targets | 4 ++--
src/redist/redist.csproj | 2 +-
5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build.proj b/build.proj
index 6bbedfabc..5bb0009eb 100644
--- a/build.proj
+++ b/build.proj
@@ -20,7 +20,7 @@
DependsOnTargets="MSBuildWorkaroundTarget;
RestoreDotnetCliBuildFramework">

- <Exec Command="$(PreviousStageDotnet) publish --no-restore -o $(DotnetCliBuildDirectory)/bin --framework netcoreapp2.0 /p:GeneratePropsFile=$(GeneratePropsFile) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)"
+ <Exec Command="$(PreviousStageDotnet) publish --no-restore -o $(DotnetCliBuildDirectory)/bin --framework netcoreapp2.0 /p:GeneratePropsFile=$(GeneratePropsFile) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion) /p:OrchestratedPackageVersionsProps=$(OrchestratedPackageVersionsProps)"
WorkingDirectory="$(DotnetCliBuildDirectory)"/>
</Target>

@@ -38,6 +38,7 @@
<PropertyGroup>
<ExtraRestoreArgs>$(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile)</ExtraRestoreArgs>
<ExtraRestoreArgs>$(ExtraRestoreArgs) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)</ExtraRestoreArgs>
+ <ExtraRestoreArgs>$(ExtraRestoreArgs) /p:OrchestratedPackageVersionsProps=$(OrchestratedPackageVersionsProps)</ExtraRestoreArgs>
<ExtraRestoreArgs Condition="'$(OS)' != 'Windows_NT'">$(ExtraRestoreArgs) --disable-parallel</ExtraRestoreArgs>
</PropertyGroup>

diff --git a/build/InitRepo.props b/build/InitRepo.props
index 077c23937..3d40eefa1 100644
--- a/build/InitRepo.props
+++ b/build/InitRepo.props
@@ -6,6 +6,7 @@
<HostInfoProps>$(GeneratedPropsDir)/HostInfo.props</HostInfoProps>
<BuildInfoProps>$(GeneratedPropsDir)/BuildInfo.props</BuildInfoProps>
<OrchestratedPackageVersionsProps>$(GeneratedPropsDir)/OrchestratedPackageVersionsProps.props</OrchestratedPackageVersionsProps>
+ <OrchestratedPackageVersionsProps Condition=" '$(DotNetPackageVersionPropsPath)' != '' ">$(DotNetPackageVersionPropsPath)</OrchestratedPackageVersionsProps>
<GeneratedNuGetConfig>$(RepoRoot)/NuGet.Config</GeneratedNuGetConfig>
</PropertyGroup>
</Project>
diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets
index aa0b563ae..d1095d7a6 100644
--- a/build/NugetConfigFile.targets
+++ b/build/NugetConfigFile.targets
@@ -1,9 +1,13 @@
<Project ToolsVersion="15.0">
+ <Import Project="$(DotNetRestoreSourcePropsPath)"
+ Condition=" '$(DotNetRestoreSourcePropsPath)' != '' "/>
+
<Target Name="WriteNugetConfigFile">

- <ItemGroup>
- <NugetConfigPrivateFeeds Include="$(ExternalRestoreSources.Split(';'))" />
- </ItemGroup>
+ <ItemGroup>
+ <NugetConfigPrivateFeeds Include="$(ExternalRestoreSources.Split(';'))" Condition="'$(DotNetBuildOffline)' != 'true'"/>
+ <NugetConfigPrivateFeeds Include="$(DotNetRestoreSources.Split(';'))" />
+ </ItemGroup>

<PropertyGroup>
<NugetConfigHeader>
@@ -47,7 +51,7 @@
Lines="$(NugetConfigHeader)"
Overwrite="true" />

- <WriteLinesToFile Condition="'$(ExternalRestoreSources)' != '' and '$(DotNetBuildOffline)' != 'true'"
+ <WriteLinesToFile Condition="'@(NugetConfigPrivateFeeds)' != ''"
File="$(GeneratedNuGetConfig)"
Lines="&lt;add key=&quot;PrivateBlobFeed%(NugetConfigPrivateFeeds.Filename)&quot; value=&quot;%(NugetConfigPrivateFeeds.Identity)&quot; /&gt;"
Overwrite="false" />
diff --git a/build/Prepare.targets b/build/Prepare.targets
index 4a5745b88..7777f07d8 100644
--- a/build/Prepare.targets
+++ b/build/Prepare.targets
@@ -64,7 +64,7 @@

<DotNetRestore ToolPath="$(PreviousStageDirectory)"
ProjectPath="&quot;%(RestoreSrcPackagesInput.FullPath)&quot;"
- AdditionalParameters="/p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)" />
+ AdditionalParameters="/p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion) /p:OrchestratedPackageVersionsProps=$(OrchestratedPackageVersionsProps)" />

</Target>

@@ -90,7 +90,7 @@

<DotNetRestore ToolPath="$(PreviousStageDirectory)"
ProjectPath="&quot;%(RestoreToolsPackagesInput.FullPath)&quot;"
- AdditionalParameters="/p:UsePortableLinuxSharedFramework=$(UsePortableLinuxSharedFramework) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)" />
+ AdditionalParameters="/p:UsePortableLinuxSharedFramework=$(UsePortableLinuxSharedFramework) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion) /p:OrchestratedPackageVersionsProps=$(OrchestratedPackageVersionsProps)" />

</Target>

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 7f6473ff5..04b9a7496 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -86,7 +86,7 @@
<DotNetPublish ToolPath="$(PreviousStageDirectory)"
Configuration="$(Configuration)"
ProjectPath="$(SrcDirectory)/tool_fsharp/tool_fsc.csproj"
- MSBuildArgs="/p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)" />
+ MSBuildArgs="/p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion) /p:OrchestratedPackageVersionsProps=$(OrchestratedPackageVersionsProps)" />
</Target>

<Target Name="GenerateCliRuntimeConfigurationFiles"
--
2.16.1.windows.4

24 changes: 24 additions & 0 deletions patches/cli/0004-Don-t-include-MSBuild-win-runtime-packages-if-BfS.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 836270b5a42f18eb758c72e8eafaa50e8f44fdd6 Mon Sep 17 00:00:00 2001
From: Davis Goodin <[email protected]>
Date: Wed, 11 Apr 2018 16:32:23 -0500
Subject: [PATCH] Don't include MSBuild win runtime packages if BfS

---
.../Microsoft.DotNet.MSBuildSdkResolver.csproj | 1 +
1 file changed, 1 insertion(+)

diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
index 2b8b1b320..eb65540da 100644
--- a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
+++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
@@ -6,6 +6,7 @@
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
<PlatformTarget>AnyCPU</PlatformTarget>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+ <RuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'"></RuntimeIdentifiers>
<WarningsAsErrors>true</WarningsAsErrors>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
--
2.16.1.windows.4

Loading