Merge branch 'release/6.0.3xx' into marcpopMSFT-catchup60300
This commit is contained in:
Matt Mitchell
GitHub
commit
a16c6b7e52
5 changed files with 23 additions and 200 deletions
|
|
@ -90,27 +90,27 @@
|
|||
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.200" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>e6d9bf1868c4aa2808714ada839018a8506bd7dd</Sha>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.300-preview.22117.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>ae80bff914f34ef76920e93d87a7805483abae27</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.200-rtm.22103.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>e6d9bf1868c4aa2808714ada839018a8506bd7dd</Sha>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.300-preview.22117.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>ae80bff914f34ef76920e93d87a7805483abae27</Sha>
|
||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.200" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>e6d9bf1868c4aa2808714ada839018a8506bd7dd</Sha>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.300-preview.22117.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>ae80bff914f34ef76920e93d87a7805483abae27</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-rtm.22104.9">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>f9b6be31b19097cb47125075ca2e8322bf591fc0</Sha>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.300-preview.22121.3">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>f6997d5bc9239c83357d0fef91043c2b4ab60c70</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-rtm.22104.9">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>f9b6be31b19097cb47125075ca2e8322bf591fc0</Sha>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.300-preview.22121.3">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>f6997d5bc9239c83357d0fef91043c2b4ab60c70</Sha>
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.2-servicing.22064.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -211,9 +211,9 @@
|
|||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22115.1">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22117.5">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
<Sha>d933cf368424482afb2bd8aebe6a412932f4fee4</Sha>
|
||||
<Sha>58acc1f97a4c7b121356ea9b33b7db29b861b81d</Sha>
|
||||
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.200</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.300-preview.22117.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.200-rtm.22104.9</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-rtm.22104.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.300-preview.22121.3</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.300-preview.22121.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
|
||||
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.200</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.300-preview.22117.1</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
||||
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
|
||||
<!-- 5.0 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.1.0-release-20220113-05</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.2.0-release-20220209-04</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- dependencies for source-build tarball -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -1,50 +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
|
||||
|
||||
Required for omnisharp, nuget-client, templating, sdk
|
||||
|
||||
Background Issue: https://github.com/dotnet/source-build/issues/2542
|
||||
Patch removal issue: https://github.com/dotnet/source-build/issues/2556
|
||||
---
|
||||
src/Build/Microsoft.Build.csproj | 3 +--
|
||||
src/Directory.Build.props | 3 +--
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
|
||||
index f75408633..8dc86355a 100644
|
||||
--- a/src/Build/Microsoft.Build.csproj
|
||||
+++ b/src/Build/Microsoft.Build.csproj
|
||||
@@ -4,8 +4,7 @@
|
||||
<Import Project="..\Shared\DebuggingSources.proj" />
|
||||
|
||||
<PropertyGroup>
|
||||
- <TargetFrameworks>net6.0</TargetFrameworks>
|
||||
- <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(FullFrameworkTFM);net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks>$(FullFrameworkTFM);net6.0</TargetFrameworks>
|
||||
<TargetFrameworks Condition="'$(MonoBuild)'=='true'">$(RuntimeOutputTargetFrameworks)</TargetFrameworks>
|
||||
<RootNamespace>Microsoft.Build</RootNamespace>
|
||||
<AssemblyName>Microsoft.Build</AssemblyName>
|
||||
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
|
||||
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
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
|
||||
|
||||
Removes prebuilts.
|
||||
|
||||
Background Issue: https://github.com/dotnet/source-build/issues/2542
|
||||
---
|
||||
eng/dependabot/Packages.props | 3 ---
|
||||
src/Build/Microsoft.Build.csproj | 4 +++-
|
||||
src/Directory.BeforeCommon.targets | 2 +-
|
||||
src/Framework/Microsoft.Build.Framework.csproj | 2 +-
|
||||
src/Samples/Directory.Build.props | 1 +
|
||||
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/dependabot/Packages.props b/eng/dependabot/Packages.props
|
||||
index a1f21de26..ff74d6e7f 100644
|
||||
--- a/eng/dependabot/Packages.props
|
||||
+++ b/eng/dependabot/Packages.props
|
||||
@@ -22,9 +22,6 @@
|
||||
|
||||
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3" />
|
||||
- </ItemGroup>
|
||||
-
|
||||
- <ItemGroup>
|
||||
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" 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="Microsoft.IO.Redist" Condition="'$(FeatureMSIORedist)' == '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/Framework/Microsoft.Build.Framework.csproj b/src/Framework/Microsoft.Build.Framework.csproj
|
||||
index df7556447..c7edff611 100644
|
||||
--- a/src/Framework/Microsoft.Build.Framework.csproj
|
||||
+++ b/src/Framework/Microsoft.Build.Framework.csproj
|
||||
@@ -31,7 +31,7 @@
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
<!-- Promote CompilerServices.Unsafe from the old version we get from System.Memory on net472. -->
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
|
||||
- <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
|
||||
+ <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Condition="'$(DotNetBuildFromSource)' != 'true'" />
|
||||
<Reference Include="System.Xaml" />
|
||||
</ItemGroup>
|
||||
|
||||
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/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
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ index 79a935391..65e482b83 100644
|
|||
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
|
||||
<NETFXTargetFrameworkVersion>v4.7.2</NETFXTargetFrameworkVersion>
|
||||
<NETFXTargetFramework>net472</NETFXTargetFramework>
|
||||
- <NETCoreTargetFramework>netcoreapp2.1</NETCoreTargetFramework>
|
||||
- <NETCoreTargetFramework>netcoreapp3.1</NETCoreTargetFramework>
|
||||
- <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</NETCoreTargetFramework>
|
||||
+ <NETCoreTargetFramework>net6.0</NETCoreTargetFramework>
|
||||
<NETCoreTestTargetFramework>netcoreapp5.0</NETCoreTestTargetFramework>
|
||||
|
|
@ -90,15 +90,6 @@ index c94acffd8..f4d083e52 100644
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<TfmSpecificPackageFile Include="$(OutputPath)\$(ILMergeSubpath)NuGet.Build.Tasks.Pack.dll" Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">
|
||||
@@ -189,7 +189,7 @@
|
||||
<TfmSpecificPackageFile Include="$(OutputPath)\$(ILMergeSubpath)NuGet*.dll" Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">
|
||||
<PackagePath>$(PackagePathDir)</PackagePath>
|
||||
</TfmSpecificPackageFile>
|
||||
- </ItemGroup>
|
||||
+ </ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Import Project="$(BuildCommonDirectory)common.targets"/>
|
||||
diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
|
||||
index 21015c00a..e306cdee4 100644
|
||||
--- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
|
||||
|
|
|
|||
Loading…
Reference in a new issue