Remove source-build patches that were backported
This commit is contained in:
MichaelSimons
parent
76632510c4
commit
6d6fe7d258
7 changed files with 0 additions and 471 deletions
|
|
@ -1,68 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Fri, 22 Oct 2021 13:26:33 -0500
|
||||
Subject: [PATCH] Fix MicrosoftExtensionsVersion
|
||||
|
||||
Move it to eng/Versions.props to make it overridable, and rename it to match an
|
||||
actual package ID.
|
||||
|
||||
Update paramater nullability in src/Logging/SimpleConsoleLogger.cs to be
|
||||
source-compatible with the 6.0 version of these packages.
|
||||
|
||||
See https://github.com/dotnet/format/issues/1400
|
||||
---
|
||||
Directory.Packages.props | 7 +++----
|
||||
eng/Versions.props | 1 +
|
||||
src/Logging/SimpleConsoleLogger.cs | 2 +-
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Directory.Packages.props b/Directory.Packages.props
|
||||
index 6b628c2..9b579ea 100644
|
||||
--- a/Directory.Packages.props
|
||||
+++ b/Directory.Packages.props
|
||||
@@ -2,7 +2,6 @@
|
||||
<!-- <Import Project="eng\Versions.props" /> -->
|
||||
|
||||
<PropertyGroup>
|
||||
- <MicrosoftExtensionsVersion>5.0.0</MicrosoftExtensionsVersion>
|
||||
<!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
|
||||
<NuGetVersion>6.0.0-preview.4.221</NuGetVersion>
|
||||
</PropertyGroup>
|
||||
@@ -25,9 +24,9 @@
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
|
||||
<PackageVersion Include="NuGet.Common" Version="$(NuGetVersion)" />
|
||||
<PackageVersion Include="NuGet.Configuration" Version="$(NuGetVersion)" />
|
||||
<PackageVersion Include="NuGet.Frameworks" Version="$(NuGetVersion)" />
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index b1990aa..f6ddbbd 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -15,6 +15,7 @@
|
||||
<PropertyGroup>
|
||||
<MicrosoftBuildVersion>16.11.0</MicrosoftBuildVersion>
|
||||
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion>
|
||||
+ <MicrosoftExtensionsDependencyInjectionVersion>5.0.0</MicrosoftExtensionsDependencyInjectionVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21526.21</MicrosoftNETCoreCompilersPackageVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/command-line-api -->
|
||||
diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs
|
||||
index c361f84..fd8015c 100644
|
||||
--- a/src/Logging/SimpleConsoleLogger.cs
|
||||
+++ b/src/Logging/SimpleConsoleLogger.cs
|
||||
@@ -37,7 +37,7 @@ namespace Microsoft.CodeAnalysis.Tools.Logging
|
||||
_minimalErrorLevel = minimalErrorLevel;
|
||||
}
|
||||
|
||||
- public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
|
||||
+ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
|
||||
{
|
||||
if (!IsEnabled(logLevel))
|
||||
{
|
||||
|
|
@ -1,164 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Fri, 19 Nov 2021 13:50:52 -0600
|
||||
Subject: [PATCH] Update system-command-line version
|
||||
|
||||
Backported with https://github.com/dotnet/format/pull/1436
|
||||
---
|
||||
eng/Version.Details.xml | 8 ++++----
|
||||
eng/Versions.props | 4 ++--
|
||||
src/Commands/FormatAnalyzersCommand.cs | 4 ++--
|
||||
src/Commands/FormatCommandCommon.cs | 12 ++++++------
|
||||
src/Commands/FormatStyleCommand.cs | 4 ++--
|
||||
src/Commands/RootFormatCommand.cs | 4 ++--
|
||||
6 files changed, 18 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
|
||||
index 48b181b..68c0b43 100644
|
||||
--- a/eng/Version.Details.xml
|
||||
+++ b/eng/Version.Details.xml
|
||||
@@ -5,13 +5,13 @@
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>c7d6f9fab845ffd943216da465022744e7d35f22</Sha>
|
||||
</Dependency>
|
||||
- <Dependency Name="System.CommandLine" Version="2.0.0-beta1.21473.1">
|
||||
+ <Dependency Name="System.CommandLine" Version="2.0.0-beta1.21525.1">
|
||||
<Uri>https://github.com/dotnet/command-line-api</Uri>
|
||||
- <Sha>82273cb56c83b589e8e5b63da0ac9745ffc6e105</Sha>
|
||||
+ <Sha>09a24a79ef01a0c70655919ee3c59bb54a8574df</Sha>
|
||||
</Dependency>
|
||||
- <Dependency Name="System.CommandLine.Rendering" Version="0.3.0-alpha.21473.1">
|
||||
+ <Dependency Name="System.CommandLine.Rendering" Version="0.3.0-alpha.21525.1">
|
||||
<Uri>https://github.com/dotnet/command-line-api</Uri>
|
||||
- <Sha>82273cb56c83b589e8e5b63da0ac9745ffc6e105</Sha>
|
||||
+ <Sha>09a24a79ef01a0c70655919ee3c59bb54a8574df</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index 2758207..6a02917 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -18,8 +18,8 @@
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21526.21</MicrosoftNETCoreCompilersPackageVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/command-line-api -->
|
||||
- <SystemCommandLineVersion>2.0.0-beta1.21473.1</SystemCommandLineVersion>
|
||||
- <SystemCommandLineRenderingVersion>0.3.0-alpha.21473.1</SystemCommandLineRenderingVersion>
|
||||
+ <SystemCommandLineVersion>2.0.0-beta1.21525.1</SystemCommandLineVersion>
|
||||
+ <SystemCommandLineRenderingVersion>0.3.0-alpha.21525.1</SystemCommandLineRenderingVersion>
|
||||
</PropertyGroup>
|
||||
<!--
|
||||
Other Dependency versions
|
||||
diff --git a/src/Commands/FormatAnalyzersCommand.cs b/src/Commands/FormatAnalyzersCommand.cs
|
||||
index 322397e..0be3daf 100644
|
||||
--- a/src/Commands/FormatAnalyzersCommand.cs
|
||||
+++ b/src/Commands/FormatAnalyzersCommand.cs
|
||||
@@ -37,13 +37,13 @@ namespace Microsoft.CodeAnalysis.Tools.Commands
|
||||
formatOptions = parseResult.ParseWorkspaceOptions(formatOptions);
|
||||
|
||||
if (parseResult.HasOption(SeverityOption) &&
|
||||
- parseResult.ValueForOption(SeverityOption) is string { Length: > 0 } analyzerSeverity)
|
||||
+ parseResult.GetValueForOption(SeverityOption) is string { Length: > 0 } analyzerSeverity)
|
||||
{
|
||||
formatOptions = formatOptions with { AnalyzerSeverity = GetSeverity(analyzerSeverity) };
|
||||
}
|
||||
|
||||
if (parseResult.HasOption(DiagnosticsOption) &&
|
||||
- parseResult.ValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
+ parseResult.GetValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
{
|
||||
formatOptions = formatOptions with { Diagnostics = diagnostics.ToImmutableHashSet() };
|
||||
}
|
||||
diff --git a/src/Commands/FormatCommandCommon.cs b/src/Commands/FormatCommandCommon.cs
|
||||
index fb69853..565c2d1 100644
|
||||
--- a/src/Commands/FormatCommandCommon.cs
|
||||
+++ b/src/Commands/FormatCommandCommon.cs
|
||||
@@ -137,7 +137,7 @@ namespace Microsoft.CodeAnalysis.Tools
|
||||
public static FormatOptions ParseVerbosityOption(this ParseResult parseResult, FormatOptions formatOptions)
|
||||
{
|
||||
if (parseResult.HasOption(VerbosityOption) &&
|
||||
- parseResult.ValueForOption(VerbosityOption) is string { Length: > 0 } verbosity)
|
||||
+ parseResult.GetValueForOption(VerbosityOption) is string { Length: > 0 } verbosity)
|
||||
{
|
||||
formatOptions = formatOptions with { LogLevel = GetLogLevel(verbosity) };
|
||||
}
|
||||
@@ -169,8 +169,8 @@ namespace Microsoft.CodeAnalysis.Tools
|
||||
|
||||
if (parseResult.HasOption(IncludeOption) || parseResult.HasOption(ExcludeOption))
|
||||
{
|
||||
- var fileToInclude = parseResult.ValueForOption(IncludeOption) ?? Array.Empty<string>();
|
||||
- var fileToExclude = parseResult.ValueForOption(ExcludeOption) ?? Array.Empty<string>();
|
||||
+ var fileToInclude = parseResult.GetValueForOption(IncludeOption) ?? Array.Empty<string>();
|
||||
+ var fileToExclude = parseResult.GetValueForOption(ExcludeOption) ?? Array.Empty<string>();
|
||||
HandleStandardInput(logger, ref fileToInclude, ref fileToExclude);
|
||||
formatOptions = formatOptions with { FileMatcher = SourceFileMatcher.CreateMatcher(fileToInclude, fileToExclude) };
|
||||
}
|
||||
@@ -179,7 +179,7 @@ namespace Microsoft.CodeAnalysis.Tools
|
||||
{
|
||||
formatOptions = formatOptions with { ReportPath = string.Empty };
|
||||
|
||||
- if (parseResult.ValueForOption(ReportOption) is string { Length: > 0 } reportPath)
|
||||
+ if (parseResult.GetValueForOption(ReportOption) is string { Length: > 0 } reportPath)
|
||||
{
|
||||
formatOptions = formatOptions with { ReportPath = reportPath };
|
||||
}
|
||||
@@ -189,7 +189,7 @@ namespace Microsoft.CodeAnalysis.Tools
|
||||
{
|
||||
formatOptions = formatOptions with { BinaryLogPath = "format.binlog" };
|
||||
|
||||
- if (parseResult.ValueForOption(BinarylogOption) is string { Length: > 0 } binaryLogPath)
|
||||
+ if (parseResult.GetValueForOption(BinarylogOption) is string { Length: > 0 } binaryLogPath)
|
||||
{
|
||||
formatOptions = Path.GetExtension(binaryLogPath)?.Equals(".binlog") == false
|
||||
? (formatOptions with { BinaryLogPath = Path.ChangeExtension(binaryLogPath, ".binlog") })
|
||||
@@ -285,7 +285,7 @@ namespace Microsoft.CodeAnalysis.Tools
|
||||
{
|
||||
var currentDirectory = Environment.CurrentDirectory;
|
||||
|
||||
- if (parseResult.ValueForArgument<string>(SlnOrProjectArgument) is string { Length: > 0 } slnOrProject)
|
||||
+ if (parseResult.GetValueForArgument<string>(SlnOrProjectArgument) is string { Length: > 0 } slnOrProject)
|
||||
{
|
||||
if (parseResult.HasOption(FolderOption))
|
||||
{
|
||||
diff --git a/src/Commands/FormatStyleCommand.cs b/src/Commands/FormatStyleCommand.cs
|
||||
index b44398c..7839855 100644
|
||||
--- a/src/Commands/FormatStyleCommand.cs
|
||||
+++ b/src/Commands/FormatStyleCommand.cs
|
||||
@@ -37,13 +37,13 @@ namespace Microsoft.CodeAnalysis.Tools.Commands
|
||||
formatOptions = parseResult.ParseWorkspaceOptions(formatOptions);
|
||||
|
||||
if (parseResult.HasOption(SeverityOption) &&
|
||||
- parseResult.ValueForOption(SeverityOption) is string { Length: > 0 } styleSeverity)
|
||||
+ parseResult.GetValueForOption(SeverityOption) is string { Length: > 0 } styleSeverity)
|
||||
{
|
||||
formatOptions = formatOptions with { CodeStyleSeverity = GetSeverity(styleSeverity) };
|
||||
}
|
||||
|
||||
if (parseResult.HasOption(DiagnosticsOption) &&
|
||||
- parseResult.ValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
+ parseResult.GetValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
{
|
||||
formatOptions = formatOptions with { Diagnostics = diagnostics.ToImmutableHashSet() };
|
||||
}
|
||||
diff --git a/src/Commands/RootFormatCommand.cs b/src/Commands/RootFormatCommand.cs
|
||||
index 741effb..40f8cc8 100644
|
||||
--- a/src/Commands/RootFormatCommand.cs
|
||||
+++ b/src/Commands/RootFormatCommand.cs
|
||||
@@ -40,14 +40,14 @@ namespace Microsoft.CodeAnalysis.Tools.Commands
|
||||
formatOptions = parseResult.ParseWorkspaceOptions(formatOptions);
|
||||
|
||||
if (parseResult.HasOption(SeverityOption) &&
|
||||
- parseResult.ValueForOption(SeverityOption) is string { Length: > 0 } defaultSeverity)
|
||||
+ parseResult.GetValueForOption(SeverityOption) is string { Length: > 0 } defaultSeverity)
|
||||
{
|
||||
formatOptions = formatOptions with { AnalyzerSeverity = GetSeverity(defaultSeverity) };
|
||||
formatOptions = formatOptions with { CodeStyleSeverity = GetSeverity(defaultSeverity) };
|
||||
}
|
||||
|
||||
if (parseResult.HasOption(DiagnosticsOption) &&
|
||||
- parseResult.ValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
+ parseResult.GetValueForOption(DiagnosticsOption) is string[] { Length: > 0 } diagnostics)
|
||||
{
|
||||
formatOptions = formatOptions with { Diagnostics = diagnostics.ToImmutableHashSet() };
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <36081148+lbussell@users.noreply.github.com>
|
||||
Date: Wed, 13 Oct 2021 18:26:09 +0000
|
||||
Subject: [PATCH] fix tlens Mono.Cecil reference
|
||||
|
||||
Pull request for applying the patch: https://github.com/dotnet/linker/pull/2317
|
||||
---
|
||||
src/tlens/tlens.csproj | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tlens/tlens.csproj b/src/tlens/tlens.csproj
|
||||
index 92b3754..e17f9fb 100644
|
||||
--- a/src/tlens/tlens.csproj
|
||||
+++ b/src/tlens/tlens.csproj
|
||||
@@ -10,7 +10,8 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
- <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
|
||||
+ <PackageReference Condition="'$(UseCecilPackage)' == 'true'" Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
|
||||
+ <ProjectReference Condition="'$(UseCecilPackage)' != 'true'" Include="../../external/cecil/Mono.Cecil.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Wed, 20 Oct 2021 14:44:36 +0000
|
||||
Subject: [PATCH] Exclude Microsoft.DotNet.ApiCompat from source-build
|
||||
|
||||
Backport PR: https://github.com/dotnet/linker/pull/2326
|
||||
---
|
||||
eng/Tools.props | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/Tools.props b/eng/Tools.props
|
||||
index 494d208..7c32ad5 100644
|
||||
--- a/eng/Tools.props
|
||||
+++ b/eng/Tools.props
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<!-- This file is an Arcade extension point that specifies additional tools to restore. -->
|
||||
<ItemGroup>
|
||||
- <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatVersion)" />
|
||||
+ <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatVersion)" Condition=" '$(DotnetBuildFromSource)' != 'true' "/>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Wed, 20 Oct 2021 14:38:14 +0000
|
||||
Subject: [PATCH 1/2] Upgrade Microsoft.NETFramework.ReferenceAssemblies from
|
||||
1.0.0 to 1.0.2
|
||||
|
||||
Backport PR: https://github.com/dotnet/linker/pull/2326
|
||||
---
|
||||
src/ILLink.Tasks/ILLink.Tasks.csproj | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj
|
||||
index 0ecf5d1..7501ecb 100644
|
||||
--- a/src/ILLink.Tasks/ILLink.Tasks.csproj
|
||||
+++ b/src/ILLink.Tasks/ILLink.Tasks.csproj
|
||||
@@ -53,6 +53,6 @@
|
||||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" PrivateAssets="All" ExcludeAssets="Runtime" />
|
||||
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" Condition=" '$(TargetFramework)' == 'net472' " PrivateAssets="All" Publish="True" />
|
||||
|
||||
- <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
|
||||
+ <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.2" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -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
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue