Skip to content

Eliminate 7.0 source-build prebuilts #14167

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
lbussell merged 88 commits into from
Sep 13, 2022
Merged

Eliminate 7.0 source-build prebuilts #14167

Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
c5aa4cb
Add runtime patch to fully qualify conflicting runtime and roslyn APIs
lbussell Jul 14, 2022
2654477
Add aspnetcore patch for lifetime scope
lbussell Jul 13, 2022
c2c41d8
Merge branch 'main' of https://github.com/dotnet/installer into 7.0-z…
MichaelSimons Jul 18, 2022
3511f9b
Add prebuilt removal patches for fixes that haven't flowed
MichaelSimons Jul 18, 2022
e42bd5e
Merge branch 'main' of https://github.com/dotnet/installer into 7.0-z…
MichaelSimons Jul 19, 2022
198f82f
Use repo name for git-info version number special cases
lbussell Jul 19, 2022
5c90657
Delete aspnetcore patches
lbussell Jul 18, 2022
012525e
Update Microsoft.Deployment.DotNet.Releases Versions.Details.xml depe…
MichaelSimons Jul 19, 2022
8e41876
Remove backported sdk patch
MichaelSimons Jul 19, 2022
f74165f
Add runtime patch to disable analyzers
MichaelSimons Jul 19, 2022
177ae03
Merge branch 'main' of https://github.com/dotnet/installer into 7.0-z…
MichaelSimons Jul 20, 2022
a99f84e
Add patch to remove app host prebuilt
MichaelSimons Jul 20, 2022
b92fb46
Add source-build patch for jwt prebuilt
MichaelSimons Jul 20, 2022
3916401
Add patches for command-line-api and msbuild net7.0 TFM
lbussell Jul 20, 2022
be51252
Update aspnetcore patch
lbussell Jul 20, 2022
927daf1
Update source-build-externals
MichaelSimons Jul 20, 2022
6161ad0
Update aspnetcore patch
MichaelSimons Jul 20, 2022
e48c176
Merge branch '7.0-zero-prebuilts' of https://github.com/MichaelSimons…
MichaelSimons Jul 20, 2022
c20d853
Add source-build-externals patch
MichaelSimons Jul 20, 2022
9ce7366
Update SBRP version
MichaelSimons Jul 21, 2022
243149c
Merge branch 'main' of https://github.com/dotnet/installer into 7.0-z…
MichaelSimons Jul 21, 2022
9cf3f5f
Revert tfm patches
MichaelSimons Jul 21, 2022
a720a1e
Revert "Revert tfm patches"
MichaelSimons Jul 21, 2022
5f297e2
Revert msbuild net70 tfm patch
MichaelSimons Jul 21, 2022
8b81bc8
Add FSharp prebuilt patch
MichaelSimons Jul 21, 2022
912c424
misc updates
MichaelSimons Jul 21, 2022
fd6176f
Merge branch 'main' of https://github.com/dotnet/installer into 7.0-z…
MichaelSimons Jul 22, 2022
0621b09
Add linker patch
MichaelSimons Jul 22, 2022
5983a57
Add linker patch
MichaelSimons Jul 22, 2022
9f002f6
Add patch for retargeting fsharp
lbussell Jul 22, 2022
6e47d88
Add patch for retargeting sdk
lbussell Jul 22, 2022
0724e8f
Merge branch 'main' of https://github.com/dotnet/installer into 7.0-z…
MichaelSimons Jul 26, 2022
91e62a0
Resolve patch conflict from latest merge
MichaelSimons Jul 26, 2022
d2c4918
Merge branch '7.0-zero-prebuilts' of https://github.com/MichaelSimons…
MichaelSimons Jul 26, 2022
9ca3256
Remove failing patches
MichaelSimons Jul 26, 2022
6c9c62d
Remove unnecessary patch
MichaelSimons Jul 26, 2022
f6bae4b
Re-add msbuild patch for net7.0 TFM
lbussell Jul 26, 2022
604b3a8
Revert "Remove failing patches"
lbussell Jul 26, 2022
1ef4bf5
Fix fsharp patch
lbussell Jul 26, 2022
db8f402
Fix msbuild patch typo
lbussell Jul 26, 2022
b0845e7
Update fsharp patch
lbussell Jul 26, 2022
721c332
Clean up SDK patch
lbussell Jul 27, 2022
b8f1153
Merge branch 'main' of https://github.com/dotnet/installer into 7.0-z…
MichaelSimons Jul 28, 2022
bfb9b20
Resolve patch conflicts from last merge
MichaelSimons Jul 28, 2022
eaf5ae2
Fix discrepancy between versions of DotNetDeltaApplier TFM version
lbussell Jul 28, 2022
8e518fd
Merge remote-tracking branch 'upstream/main' into 7.0-zero-prebuilts
lbussell Aug 2, 2022
86a0f48
Update SDK patch
lbussell Aug 2, 2022
8df754a
Fix fsharp patch
lbussell Aug 2, 2022
0945d00
Fix msbuild build error
lbussell Aug 3, 2022
f4759b9
Update nuget-client to net7.0
lbussell Aug 3, 2022
23efb72
Update order of projects in known-good
lbussell Aug 3, 2022
065a100
Fix fsharp xml doc path for net7.0
lbussell Aug 3, 2022
ba4f5f6
Add missing change in msbuild patch
lbussell Aug 3, 2022
a510dcc
Merge remote-tracking branch 'upstream/main' into 7.0-zero-prebuilts
lbussell Aug 4, 2022
46acdda
Fix SDK patch
lbussell Aug 4, 2022
5654836
Add runtime patch for targeting net7.0
lbussell Aug 4, 2022
64f508b
Fix runtime-portable build
lbussell Aug 5, 2022
901c86c
Add patch for roslyn-analyzers net7.0 TFM
lbussell Aug 8, 2022
786b296
Merge remote-tracking branch 'upstream/main' into 7.0-zero-prebuilts
lbussell Aug 8, 2022
077c96f
Fix runtime patches
lbussell Aug 8, 2022
10657ee
Add patch for targeting net7.0 in roslyn
lbussell Aug 9, 2022
f00cff2
Merge remote-tracking branch 'upstream/main' into 7.0-zero-prebuilts
lbussell Aug 9, 2022
f5ca640
Fix Microsoft.CSharp.Core.targets location
lbussell Aug 10, 2022
78c8fd1
Merge remote-tracking branch 'upstream/release/7.0.1xx' into 7.0-zero…
lbussell Aug 22, 2022
5b24485
Update patches
lbussell Aug 22, 2022
e4a5da4
Update roslyn patch
lbussell Aug 23, 2022
9e57c88
Update prebuilts version
lbussell Aug 23, 2022
fee3e87
Update roslyn patch again
lbussell Aug 23, 2022
9049c9f
Add vstest patch for targeting net7.0
lbussell Aug 23, 2022
efda346
Change minimum supported TFM in runtime
lbussell Aug 23, 2022
e3236ac
Revert "Add vstest patch for targeting net7.0"
lbussell Aug 23, 2022
82c3428
Add patch to update compatibility suppressions in runtime
lbussell Aug 24, 2022
dbe6913
Use dev/haplois/net67 branch of vstest for validation. PR: https://gi…
lbussell Aug 24, 2022
4018e1c
Get rid of 2.0.X prebuilts from xliff
lbussell Aug 24, 2022
106bec4
Disable targeting windows in roslyn for source-build
lbussell Aug 25, 2022
971b435
Merge remote-tracking branch 'upstream/release/7.0.1xx' into 7.0-zero…
lbussell Aug 25, 2022
8036901
Delete backported runtime patches
lbussell Aug 25, 2022
006d93e
Fix xliff patch
lbussell Aug 25, 2022
2254eca
Merge remote-tracking branch 'upstream/release/7.0.1xx' into 7.0-zero…
lbussell Aug 31, 2022
3159a2f
Remove backported roslyn patch
lbussell Aug 31, 2022
98e26f7
Merge remote-tracking branch 'upstream/release/7.0.1xx' into 7.0-zero…
lbussell Sep 7, 2022
f51b250
Remove backported fsharp patch
lbussell Sep 7, 2022
494c5fd
Update SDK patch
lbussell Sep 9, 2022
1feeeca
Merge branch 'release/7.0.1xx' of https://github.com/dotnet/installer…
MichaelSimons Sep 12, 2022
83c5a6b
Remove backported source build patches
MichaelSimons Sep 12, 2022
dd63a1e
Update patches
lbussell Sep 12, 2022
72f2415
Remove roslyn patch for net7.0 TFM
lbussell Sep 12, 2022
0d23606
Update SDK patch roslyn bits location
lbussell Sep 13, 2022
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
Prev Previous commit
Next Next commit
Fix SDK patch
  • Loading branch information
@lbussell
lbussell committed Aug 4, 2022
commit 46acdda613967bcd91fc5cb235f85102a0a85057
90 changes: 45 additions & 45 deletions src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,22 @@ Date: Fri, 22 Jul 2022 15:10:08 -0700
Subject: [PATCH] Change TargetFramework to net7.0

---
.../Microsoft.Extensions.DotNetDeltaApplier.csproj | 2 +-
.../Microsoft.DotNet.Cli.Utils.csproj | 2 +-
.../Microsoft.DotNet.ApiCompat.Task.csproj | 2 +-
.../build/Microsoft.DotNet.ApiCompat.Task.targets | 2 +-
.../Microsoft.DotNet.ApiCompat.Tool.csproj | 2 +-
.../Microsoft.DotNet.ApiCompatibility.csproj | 2 +-
.../Microsoft.DotNet.PackageValidation.csproj | 2 +-
.../Microsoft.Extensions.DotNetDeltaApplier.csproj | 2 +-
.../Microsoft.DotNet.Cli.Utils.csproj | 2 +-
src/Layout/redist/targets/GenerateLayout.targets | 4 ++--
src/Layout/redist/targets/OverlaySdkOnLKG.targets | 2 +-
src/Layout/tool_fsharp/tool_fsc.csproj | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
index 40927ae1f2..3c2236e38d 100644
--- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
+++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Intentionally pinned. This feature is supported in projects targeting 6.0 or newer.-->
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>

<IsPackable>false</IsPackable>
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
index 006f56939d..ddcfe2e362 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
@@ -22,7 +22,7 @@

<Target Name="VerifyMSBuildDependency" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetFramework)' == '$(SdkTargetFramework)'">
<PropertyGroup>
- <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll</MSBuildPathInPackage>
+ <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll</MSBuildPathInPackage>
</PropertyGroup>
<Error Condition="!Exists('$(MSBuildPathInPackage)')" Text="Something moved around in Microsoft.Build.Runtime, adjust code here accordingly." />
<ItemGroup>
diff --git a/src/Compatibility/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj b/src/Compatibility/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
index 8177095a90..0c1f7acebf 100644
--- a/src/Compatibility/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
+++ b/src/Compatibility/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

Expand All @@ -55,10 +29,10 @@ index 8177095a90..0c1f7acebf 100644
<IsPackable>true</IsPackable>
<IsShippingPackage>true</IsShippingPackage>
<StrongNameKeyId>Open</StrongNameKeyId>
diff --git a/src/Compatibility/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets b/src/Compatibility/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets
diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets
index fb49a12fb4..2ce737c75d 100644
--- a/src/Compatibility/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets
+++ b/src/Compatibility/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets
--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets
+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/build/Microsoft.DotNet.ApiCompat.Task.targets
@@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
Expand All @@ -68,10 +42,10 @@ index fb49a12fb4..2ce737c75d 100644
<UseApiCompatPackage>true</UseApiCompatPackage>
<!-- TODO: Remove when the consumers of this package upgraded to a newer SDK with this change. -->
<UseCompatibilityPackage>true</UseCompatibilityPackage>
diff --git a/src/Compatibility/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/Compatibility/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
index 2de17ce715..32e6580920 100644
--- a/src/Compatibility/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
+++ b/src/Compatibility/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

Expand All @@ -81,23 +55,23 @@ index 2de17ce715..32e6580920 100644
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
<IsPackable>true</IsPackable>
diff --git a/src/Compatibility/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/Compatibility/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
index 0f880d418d..833b801809 100644
--- a/src/Compatibility/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
+++ b/src/Compatibility/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
index d875a6a5a4..a58cf47e98 100644
--- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
- <TargetFrameworks>net6.0;net472</TargetFrameworks>
+ <TargetFrameworks>net7.0;net472</TargetFrameworks>
<StrongNameKeyId>Open</StrongNameKeyId>
<Nullable>enable</Nullable>
<!-- We need to compare ISymbols in a special way (by name) and roslyn symbol comparers take more heuristics into consideration.-->
<NoWarn>RS1024;$(NoWarn)</NoWarn>
diff --git a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
diff --git a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
index aa6de655f5..fca12f7f67 100644
--- a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
+++ b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
--- a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
+++ b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

Expand All @@ -107,6 +81,32 @@ index aa6de655f5..fca12f7f67 100644
<StrongNameKeyId>Open</StrongNameKeyId>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
index 40927ae1f2..3c2236e38d 100644
--- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
+++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Intentionally pinned. This feature is supported in projects targeting 6.0 or newer.-->
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>

<IsPackable>false</IsPackable>
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
index 006f56939d..ddcfe2e362 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
@@ -22,7 +22,7 @@

<Target Name="VerifyMSBuildDependency" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetFramework)' == '$(SdkTargetFramework)'">
<PropertyGroup>
- <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll</MSBuildPathInPackage>
+ <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll</MSBuildPathInPackage>
</PropertyGroup>
<Error Condition="!Exists('$(MSBuildPathInPackage)')" Text="Something moved around in Microsoft.Build.Runtime, adjust code here accordingly." />
<ItemGroup>
diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
index c493a1111c..7aa7a82bde 100644
--- a/src/Layout/redist/targets/GenerateLayout.targets
Expand Down