From 550236dd4fe2ed09577dff1e2f9e0f54427fea98 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Mon, 22 Mar 2021 14:47:14 -0500 Subject: [PATCH 01/36] Update from Bar Build Id 83461 --- NuGet.config | 19 +++++++++++++- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 1 - 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index e62a945abe..b84156839b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,8 +2,25 @@ + + + + + + + + + + + - + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb621ba00b..d9fbd0e305 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,20 +22,20 @@ c01a538851a8ab1a1fbeb2e6243f391fff7587b4 aspnet-xdt - + https://github.com/mono/linker - e0b9157b540f5fc020b2e7967f4bbd23ba826e4e + c43f981eec336c1dc4fd0ead84b5e09db9377d9e linker - - https://github.com/dotnet/runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2f740adc1457e8a28c1c072993b66f515977eb51 runtime runtime-portable - + https://github.com/dotnet/templating - 8dc4f8a9283d45103e132026797af30ead2aad6d + 8470ff317250d761c72f920b8ea1c0700b230eb3 https://github.com/dotnet/test-templates @@ -46,26 +46,26 @@ https://github.com/dotnet/command-line-api afd010ba8cb3cbd714c734465d1a5de1ee133e2d - + https://github.com/dotnet/roslyn - 9ed4b774d20940880de8df1ca8b07508aa01c8cd + 59eedc33d35754759994155ea2f4e1012a9951e3 - + https://github.com/dotnet/msbuild - 39993bd9d02917993b6147a9973dc3aa6e9b00c7 + 5e4b48a27efce55a613664b58d353ab4c8d1f6c1 - + https://github.com/dotnet/roslyn-analyzers - 77b259353aa44ec1510951a75c6e7ed6e662a001 + 3c1d0c486c3044f97a48cfd6e18ce843870e24cb - - https://github.com/NuGet/NuGet.Client - 830c8be45dbbccd411ecf6080abff0c2c98079cf + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + fad4343fa8ba919bb8a1b86bb22310824bf14268 nuget-client - - https://github.com/dotnet/sdk - 2932b586ae1ebf28415df80e0bf96d8015f2c192 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + a72246a718539102e538d046e60ef93072370898 sdk @@ -83,22 +83,22 @@ https://github.com/dotnet/xliff-tasks a52f3d7fb58470749ee4035fbbcb7e63c78b0459 - - https://github.com/dotnet/aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + d827c653b787c07de908240b7746ce34d3e6271e aspnetcore - + https://github.com/dotnet/fsharp - da6be68280c89131cdba2045525b80890401defd + 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - 212656d7b384a506aa714999f678b3ace82d114e + 6a858a323caa439115e9e3cf1c958b04f4ff9993 - - https://github.com/dotnet/installer - ca6b6acadbd30de2160ab6a003fba072b2c7b568 + + https://dev.azure.com/dnceng/internal/_git/dotnet-installer + 748f5c681b8bcb7ec9ef65de459239973d48f70f installer diff --git a/eng/Versions.props b/eng/Versions.props index 66f04be2da..d408ebde29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,6 @@ $(MajorVersion).$(MinorVersion).$(RuntimePatchVersion) $(MajorVersion).$(MinorVersion).$(SdkPatchVersion) - 0.1.0 From 647a1442bd412d926d1d484cc69a515b0820432b Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 23 Mar 2021 13:58:55 +0000 Subject: [PATCH 02/36] Update to use N-1 versions --- eng/Versions.props | 6 +++--- global.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d408ebde29..57b8f48434 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,8 +4,8 @@ 5 0 - 4 - 104 + 5 + 202 $(MajorVersion).$(MinorVersion).$(RuntimePatchVersion) $(MajorVersion).$(MinorVersion).$(RuntimePatchVersion) $(MajorVersion).$(MinorVersion).$(SdkPatchVersion) @@ -24,6 +24,6 @@ 1.0.0-beta.20623.1 - 0.1.0-5.0.103-992795-20210212.2 + 0.1.0-5.0.104-1039752-20210315.3 diff --git a/global.json b/global.json index 6d269871ad..2799197eaf 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.102" + "dotnet": "5.0.104" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 099db2e4edd2d5ec81c47b6ec0a9da6bd7babbf5 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 23 Mar 2021 13:59:16 +0000 Subject: [PATCH 03/36] Add internal feeds to build.sh --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index ed97d00e1c..2d93912427 100755 --- a/build.sh +++ b/build.sh @@ -108,9 +108,9 @@ if [ "${internalPackageFeedPat:-}" ]; then # TODO: Read these from nuget.config # The internal transport isn't added by Darc, though, so it will still need special-casing. export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [ - {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-c636bbdc/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, - {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-d827c653/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, - {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-installer-72dec52d/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-3c1d0c48/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, {"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"} ]}' fi From 4de56c6b4deace92bce591ad39e949035c72281d Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 23 Mar 2021 13:59:51 +0000 Subject: [PATCH 04/36] Setup SourceDirectory names --- repos/aspnetcore.proj | 2 +- repos/installer.proj | 2 +- repos/nuget-client.proj | 2 +- repos/runtime.common.props | 2 +- repos/sdk.proj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj index 50e459d144..9fbfee819a 100644 --- a/repos/aspnetcore.proj +++ b/repos/aspnetcore.proj @@ -1,6 +1,6 @@ - aspnetcore + dotnet-aspnetcore diff --git a/repos/installer.proj b/repos/installer.proj index fd8a95be04..16b412218b 100644 --- a/repos/installer.proj +++ b/repos/installer.proj @@ -1,6 +1,6 @@ - installer + dotnet-installer diff --git a/repos/nuget-client.proj b/repos/nuget-client.proj index 7f335eb476..3b2addf0cb 100644 --- a/repos/nuget-client.proj +++ b/repos/nuget-client.proj @@ -1,7 +1,7 @@ - NuGet.Client + NuGet-NuGet.Client-Trusted diff --git a/repos/runtime.common.props b/repos/runtime.common.props index 97ceb231ee..cb18f6b096 100644 --- a/repos/runtime.common.props +++ b/repos/runtime.common.props @@ -1,6 +1,6 @@ - runtime + dotnet-runtime diff --git a/repos/sdk.proj b/repos/sdk.proj index cdd16b3088..2da73f36e3 100644 --- a/repos/sdk.proj +++ b/repos/sdk.proj @@ -1,6 +1,6 @@ - sdk + dotnet-sdk From 0aea535e625e0163a1c51edc9eaf509430629982 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Tue, 23 Mar 2021 09:30:42 -0500 Subject: [PATCH 05/36] Update from Bar Build ID 83582 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index b84156839b..9731afceab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9fbd0e305..cf4f03138b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,16 +56,16 @@ https://github.com/dotnet/roslyn-analyzers - 3c1d0c486c3044f97a48cfd6e18ce843870e24cb + ce71b27be743710012c0460071da188b2f05959c https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted fad4343fa8ba919bb8a1b86bb22310824bf14268 nuget-client - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a72246a718539102e538d046e60ef93072370898 + 461a94d08054f1b683ef2855c18acf9de0e1175c sdk @@ -96,9 +96,9 @@ https://github.com/microsoft/vstest 6a858a323caa439115e9e3cf1c958b04f4ff9993 - + https://dev.azure.com/dnceng/internal/_git/dotnet-installer - 748f5c681b8bcb7ec9ef65de459239973d48f70f + 3346fa974fffdbb431685520cce0ff793568499a installer From 56106de314b4605e3fee81f941ecd99f26d193bf Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Tue, 23 Mar 2021 13:35:00 -0500 Subject: [PATCH 06/36] Update from Bar Build Id 83582 again --- NuGet.config | 1 + eng/Version.Details.xml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9731afceab..addf00421b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf4f03138b..f6c5de9eb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,7 +46,7 @@ https://github.com/dotnet/command-line-api afd010ba8cb3cbd714c734465d1a5de1ee133e2d - + https://github.com/dotnet/roslyn 59eedc33d35754759994155ea2f4e1012a9951e3 @@ -69,7 +69,7 @@ sdk - https://github.com/dotnet/cliCommandLineParser + https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 clicommandlineparser @@ -83,16 +83,16 @@ https://github.com/dotnet/xliff-tasks a52f3d7fb58470749ee4035fbbcb7e63c78b0459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d827c653b787c07de908240b7746ce34d3e6271e + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb aspnetcore https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest 6a858a323caa439115e9e3cf1c958b04f4ff9993 From c10cfa419cb6d67d2b52189eb5ea4d48ecca323d Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 25 Mar 2021 15:32:54 +0000 Subject: [PATCH 07/36] Patch reconciliation --- ...-dependency-not-used-in-source-build.patch | 4 +- ...Support-global.json-on-arm64-as-well.patch | 6 +- .../0001-Pin-S.R.Emit-to-a-ref-version.patch | 25 -- ...t-Build-to-reference-package-version.patch | 4 +- ...03-Use-source-built-S.R.Emit-version.patch | 25 -- ...4-Revert-some-F-changes-for-new-APIs.patch | 8 +- .../0005-Fix-package-downgrade-warning.patch | 8 +- ....0-TFM-to-avoid-3.1-apphost-prebuilt.patch | 164 ++++------ ...formAbstractions-and-NuGet.Versionin.patch | 9 +- ...ILD_SKIP_BUNDLEDDOTNETTOOLS-property.patch | 2 +- ...ewtonsoft-json-to-a-specific-version.patch | 6 +- .../0005-Remove-unneeded-feeds.patch | 14 +- .../nuget-client/0007-build-for-.NET-5.patch | 37 +-- ...8-Use-source-built-Microsoft.Web.Xdt.patch | 16 +- .../0001-WIP-for-source-build.patch | 4 +- .../0004-Update-to-netstandard2.0.patch | 20 +- ...-Don-t-restore-tools-in-source-build.patch | 15 +- ...https-github.com-dotnet-roslyn-issue.patch | 4 +- ...Re-enable-CodeStyle-for-source-build.patch | 28 -- ...ild-Roslyn-as-net5.0-in-source-build.patch | 4 +- ...nditionally-include-PrecompileScript.patch | 4 +- patches/sdk/0006-Remove-test-project.patch | 284 +----------------- .../0020-Add-slnf-file-for-source-build.patch | 55 ++++ ...e-vstest-build-script-to-add-binlogs.patch | 19 +- ...se-for-nuget-packages-to-point-to-MI.patch | 249 +++++++++++---- ...time-identifier-from-vstest-projects.patch | 10 +- patches/vstest/0006-build-for-.NET-5.patch | 77 ++--- ....Diagnostics.NETCore.Client-from-PVP.patch | 10 +- repos/sdk.proj | 1 + 29 files changed, 409 insertions(+), 703 deletions(-) delete mode 100644 patches/fsharp/0001-Pin-S.R.Emit-to-a-ref-version.patch delete mode 100644 patches/fsharp/0003-Use-source-built-S.R.Emit-version.patch delete mode 100644 patches/roslyn/0010-Re-enable-CodeStyle-for-source-build.patch create mode 100644 patches/sdk/0020-Add-slnf-file-for-source-build.patch diff --git a/patches/aspnetcore/0004-Remove-Yarn-dependency-not-used-in-source-build.patch b/patches/aspnetcore/0004-Remove-Yarn-dependency-not-used-in-source-build.patch index efd9c7b397..04e3fe64a8 100644 --- a/patches/aspnetcore/0004-Remove-Yarn-dependency-not-used-in-source-build.patch +++ b/patches/aspnetcore/0004-Remove-Yarn-dependency-not-used-in-source-build.patch @@ -32,8 +32,8 @@ index 5e4856113a..101f6c4fac 100644 }, "msbuild-sdks": { - "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21112.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21112.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.7", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21159.7" } diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj index 939ba16f88..ea2c849ea3 100644 diff --git a/patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch b/patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch index 6a533b5aa4..0344acb483 100644 --- a/patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch +++ b/patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch @@ -24,18 +24,18 @@ index 101f6c4fac..70047a815a 100644 +++ b/global.json @@ -5,13 +5,10 @@ "tools": { - "dotnet": "5.0.103", + "dotnet": "5.0.104", "runtimes": { - "dotnet/x64": [ + "dotnet": [ - "2.1.25", + "2.1.26", "$(MicrosoftNETCoreAppInternalPackageVersion)" ], - "dotnet/x86": [ - "$(MicrosoftNETCoreAppInternalPackageVersion)" - ], "aspnetcore/x64": [ - "3.1.12" + "3.1.13" ] -- 2.18.0 diff --git a/patches/fsharp/0001-Pin-S.R.Emit-to-a-ref-version.patch b/patches/fsharp/0001-Pin-S.R.Emit-to-a-ref-version.patch deleted file mode 100644 index 362300b316..0000000000 --- a/patches/fsharp/0001-Pin-S.R.Emit-to-a-ref-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 716dd289ad0682e0aaf43fc8afdc6ca1934c52fa Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 4 Sep 2019 16:09:32 -0500 -Subject: [PATCH] Pin S.R.Emit to a ref version. - ---- - src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj -index d192102..bf919d1 100644 ---- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj -+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj -@@ -740,7 +740,7 @@ - - - -- -+ - - - --- -1.8.3.1 - diff --git a/patches/fsharp/0002-Update-Microsoft-Build-to-reference-package-version.patch b/patches/fsharp/0002-Update-Microsoft-Build-to-reference-package-version.patch index 802e78fbe2..daa656dc26 100644 --- a/patches/fsharp/0002-Update-Microsoft-Build-to-reference-package-version.patch +++ b/patches/fsharp/0002-Update-Microsoft-Build-to-reference-package-version.patch @@ -11,8 +11,8 @@ diff --git a/eng/Versions.props b/eng/Versions.props index 054a03516..740c3c30c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -116,7 +116,7 @@ - 2.0.17 +@@ -114,7 +114,7 @@ + 2.0.28 $(RoslynVersion) - 16.6 diff --git a/patches/fsharp/0003-Use-source-built-S.R.Emit-version.patch b/patches/fsharp/0003-Use-source-built-S.R.Emit-version.patch deleted file mode 100644 index 61ca945605..0000000000 --- a/patches/fsharp/0003-Use-source-built-S.R.Emit-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7fa334b14bd8f4e3e388f0f297fef736db80feaa Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Mon, 29 Jun 2020 16:50:04 +0000 -Subject: [PATCH 3/3] Use source-built S.R.Emit version. - ---- - .../FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj -index f138fba02..9b33f9488 100644 ---- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj -+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj -@@ -753,7 +753,7 @@ - - - -- -+ - - - --- -2.17.1 - diff --git a/patches/fsharp/0004-Revert-some-F-changes-for-new-APIs.patch b/patches/fsharp/0004-Revert-some-F-changes-for-new-APIs.patch index 972da5c3fd..0f2a97ded4 100644 --- a/patches/fsharp/0004-Revert-some-F-changes-for-new-APIs.patch +++ b/patches/fsharp/0004-Revert-some-F-changes-for-new-APIs.patch @@ -4,13 +4,13 @@ Date: Mon, 29 Jun 2020 18:31:35 +0000 Subject: [PATCH 4/4] Revert some F# changes for new APIs. --- - src/absil/ilreflect.fs | 12 ++++++------ + src/fsharp/absil/ilreflect.fs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs +diff --git a/src/fsharp/absil/ilreflect.fs b/src/fsharp/absil/ilreflect.fs index 7f048dd5b..d2010a9dc 100644 ---- a/src/absil/ilreflect.fs -+++ b/src/absil/ilreflect.fs +--- a/src/fsharp/absil/ilreflect.fs ++++ b/src/fsharp/absil/ilreflect.fs @@ -1568,7 +1568,7 @@ let rec buildMethodPass2 cenv tref (typB: TypeBuilder) emEnv (mdef: ILMethodDef) // Method generic type parameters buildGenParamsPass1 emEnv methB.DefineGenericParametersAndLog mdef.GenericParams diff --git a/patches/fsharp/0005-Fix-package-downgrade-warning.patch b/patches/fsharp/0005-Fix-package-downgrade-warning.patch index cbbdb0d0ae..b4dc21d149 100644 --- a/patches/fsharp/0005-Fix-package-downgrade-warning.patch +++ b/patches/fsharp/0005-Fix-package-downgrade-warning.patch @@ -6,7 +6,7 @@ Subject: [PATCH 5/5] Fix package downgrade warning --- .../FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj | 4 ++-- .../FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj | 4 ++-- - .../FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec | 4 ++-- + .../Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec | 4 ++-- src/fsharp/fsc/fsc.fsproj | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) @@ -40,10 +40,10 @@ index aced6e1b4..fcdacc30b 100644 -diff --git a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec +diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec index b96f90d2a..366488b47 100644 ---- a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec -+++ b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec +--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec ++++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec @@ -22,8 +22,8 @@ diff --git a/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch b/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch index e37b90b04f..9d91758eab 100644 --- a/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch +++ b/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch @@ -1,91 +1,58 @@ -From c13763b3a2deba6cb48afd4e08157ae647d59a5a Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 20 Nov 2020 19:13:35 -0600 +From 2e75e18f01c08390adb1914c9fe40cce7c3f9ed4 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Wed, 24 Mar 2021 15:10:07 +0000 Subject: [PATCH] Use net5.0 TFM to avoid 3.1 apphost prebuilt See https://github.com/dotnet/source-build/issues/1905 --- - FSharp.Profiles.props | 2 +- - eng/Versions.props | 1 + - eng/build.sh | 12 ++--- - proto.proj | 6 +-- + eng/build.sh | 11 +++--- + proto.proj | 4 +-- .../AssemblyCheck/AssemblyCheck.fsproj | 2 +- src/buildtools/fslex/fslex.fsproj | 2 +- src/buildtools/fsyacc/fsyacc.fsproj | 2 +- - src/fsharp/FSharp.Build/FSharp.Build.fsproj | 2 + - .../Microsoft.FSharp.Compiler.csproj | 8 ++-- - .../Microsoft.FSharp.Compiler.nuspec | 44 +++++++++---------- + .../Microsoft.FSharp.Compiler.csproj | 6 ++-- + .../Microsoft.FSharp.Compiler.nuspec | 34 +++++++++---------- src/fsharp/fsc/fsc.fsproj | 1 + src/fsharp/fsi/fsi.fsproj | 3 +- - 12 files changed, 46 insertions(+), 39 deletions(-) + 9 files changed, 34 insertions(+), 31 deletions(-) -diff --git a/FSharp.Profiles.props b/FSharp.Profiles.props -index 1abb6c8a9..2d0c44752 100644 ---- a/FSharp.Profiles.props -+++ b/FSharp.Profiles.props -@@ -7,7 +7,7 @@ - $(DefineConstants);ENABLE_MONO_SUPPORT - - -- -+ - $(DefineConstants);NETSTANDARD - $(DefineConstants);FX_NO_APP_DOMAINS - $(DefineConstants);FX_NO_CORHOST_SIGNER -diff --git a/eng/Versions.props b/eng/Versions.props -index 14e6695d7..799efed6c 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -82,6 +82,7 @@ - - 4.5.1 - 1.5.0 -+ 5.0.0 - 4.3.0 - 4.3.0 - 4.0.0 diff --git a/eng/build.sh b/eng/build.sh -index 32af25330..16d8c65a7 100755 +index e741ff854..4aa80d6ca 100755 --- a/eng/build.sh +++ b/eng/build.sh -@@ -246,20 +246,22 @@ function BuildSolution { +@@ -244,20 +244,21 @@ function BuildSolution { + BuildMessage="Error building tools" MSBuild "$repo_root/src/buildtools/buildtools.proj" \ /restore \ - /p:Configuration=$bootstrap_config \ -- /t:Publish -+ /t:Publish \ -+ /bl:proto-fslex-tools.binlog +- /p:Configuration=$bootstrap_config ++ /p:Configuration=$bootstrap_config \ ++ /bl: proto-fslex-tools.binlog mkdir -p "$bootstrap_dir" -- cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp3.1/publish $bootstrap_dir/fslex -- cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp3.1/publish $bootstrap_dir/fsyacc -+ cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0/publish $bootstrap_dir/fslex -+ cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0/publish $bootstrap_dir/fsyacc +- cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp3.1 $bootstrap_dir/fslex +- cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp3.1 $bootstrap_dir/fsyacc ++ cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex ++ cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc fi if [ ! -f "$bootstrap_dir/fsc.exe" ]; then BuildMessage="Error building bootstrap" MSBuild "$repo_root/proto.proj" \ /restore \ /p:Configuration=$bootstrap_config \ -- /t:Publish -+ /t:Publish \ + /bl:proto-fsc-bootstrap.binlog -- cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp3.1/publish $bootstrap_dir/fsc -+ cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0/publish $bootstrap_dir/fsc +- +- cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp3.1 $bootstrap_dir/fsc ++ cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc fi # do real build diff --git a/proto.proj b/proto.proj -index f24b2580e..3179197be 100644 +index bb2f97270..bb0778345 100644 --- a/proto.proj +++ b/proto.proj -@@ -7,13 +7,13 @@ - - - -- TargetFramework=netcoreapp3.1 -+ TargetFramework=net5.0 +@@ -10,10 +10,10 @@ + TargetFramework=netstandard2.0 - TargetFramework=netcoreapp3.1 @@ -136,30 +103,10 @@ index a2b8cb384..5d1b7141f 100644 INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) true -diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj -index c62b2c2d9..28323a704 100644 ---- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj -+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj -@@ -7,6 +7,7 @@ - $(ProtoTargetFramework) - net472;netcoreapp3.1 - netcoreapp3.1 -+ net5.0 - FSharp.Build - $(NoWarn);45;55;62;75;1204 - true -@@ -54,6 +55,7 @@ - - - -+ - - - -diff --git a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.csproj b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.csproj -index 7424df113..545094b7a 100644 ---- a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.csproj -+++ b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.csproj +diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj +index e75296aa7..26620118b 100644 +--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj ++++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj @@ -2,7 +2,7 @@ @@ -169,7 +116,7 @@ index 7424df113..545094b7a 100644 Microsoft.FSharp.Compiler.nuspec true .NET Core compatible version of the F# compiler fsc.exe. -@@ -11,13 +11,13 @@ +@@ -11,10 +11,10 @@ @@ -181,15 +128,11 @@ index 7424df113..545094b7a 100644 + TargetFramework=net5.0 -- TargetFramework=netcoreapp3.1 -+ TargetFramework=net5.0 - - TargetFramework=netstandard2.0 -diff --git a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec -index 366488b47..f8bc431d1 100644 ---- a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec -+++ b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec +diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec +index f5cac7b09..933b63b1f 100644 +--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec ++++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec @@ -4,7 +4,7 @@ $CommonMetadataElements$ en-US @@ -199,22 +142,22 @@ index 366488b47..f8bc431d1 100644 -@@ -46,37 +46,37 @@ +@@ -46,21 +46,21 @@ this approach gives a very small deployment. Which is kind of necessary. --> -- -- +- +- - - - -- -+ -+ +- ++ ++ + + + -+ ++ + target="lib\net5.0" /> @@ -227,17 +170,12 @@ index 366488b47..f8bc431d1 100644 - -- -- -- -- -- + -+ -+ -+ -+ -+ + + + +@@ -68,15 +68,15 @@ + - @@ -247,9 +185,9 @@ index 366488b47..f8bc431d1 100644 + target="lib\net5.0" /> -- +- + target="lib\net5.0" /> -+ ++ + target="lib\net5.0" /> @@ -259,7 +197,7 @@ index 366488b47..f8bc431d1 100644 diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj -index df16c1554..7bcc01024 100644 +index b41676ca2..d87e05844 100644 --- a/src/fsharp/fsc/fsc.fsproj +++ b/src/fsharp/fsc/fsc.fsproj @@ -7,6 +7,7 @@ @@ -267,11 +205,11 @@ index df16c1554..7bcc01024 100644 net472;netcoreapp3.1 netcoreapp3.1 + net5.0 - .exe $(NoWarn);45;55;62;75;1204 true + $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj -index bb2bcc73b..fa146ed38 100644 +index 0f1a28f15..5422267a4 100644 --- a/src/fsharp/fsi/fsi.fsproj +++ b/src/fsharp/fsi/fsi.fsproj @@ -7,6 +7,7 @@ @@ -279,9 +217,9 @@ index bb2bcc73b..fa146ed38 100644 net472;netcoreapp3.1 netcoreapp3.1 + net5.0 - .exe $(NoWarn);45;55;62;75;1204 true + $(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1 @@ -50,7 +51,7 @@ diff --git a/patches/installer/0003-Use-PVP-for-PlatformAbstractions-and-NuGet.Versionin.patch b/patches/installer/0003-Use-PVP-for-PlatformAbstractions-and-NuGet.Versionin.patch index 2200ec928a..6bc8c003b4 100644 --- a/patches/installer/0003-Use-PVP-for-PlatformAbstractions-and-NuGet.Versionin.patch +++ b/patches/installer/0003-Use-PVP-for-PlatformAbstractions-and-NuGet.Versionin.patch @@ -4,8 +4,8 @@ Date: Mon, 29 Jun 2020 18:47:02 -0400 Subject: [PATCH 3/3] Use PVP for PlatformAbstractions and NuGet.Versioning --- - src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/core-sdk-tasks/core-sdk-tasks.csproj | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 20ce4702e..fb165a29a 100644 @@ -15,11 +15,12 @@ index 20ce4702e..fb165a29a 100644 -- +- +- + ++ - -- 2.18.0 diff --git a/patches/installer/0009-Restore-CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS-property.patch b/patches/installer/0009-Restore-CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS-property.patch index c31071e0ba..b8420372c8 100644 --- a/patches/installer/0009-Restore-CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS-property.patch +++ b/patches/installer/0009-Restore-CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS-property.patch @@ -17,7 +17,7 @@ index 0b5b202e0..0d3cc2e8c 100644 + - + -- 2.18.0 diff --git a/patches/nuget-client/0002-Pin-newtonsoft-json-to-a-specific-version.patch b/patches/nuget-client/0002-Pin-newtonsoft-json-to-a-specific-version.patch index df61ee1419..34ca75d81c 100644 --- a/patches/nuget-client/0002-Pin-newtonsoft-json-to-a-specific-version.patch +++ b/patches/nuget-client/0002-Pin-newtonsoft-json-to-a-specific-version.patch @@ -14,12 +14,12 @@ index a5fa8b5f6..7ceec6b95 100644 @@ -1,7 +1,7 @@ - 16.6.0 + 16.8.0 - 9.0.1 + 9.0.1 4.3.0 - 16.6.255 - 16.6.30107.105 + 16.9.30701-preview-3-30804-187 + 16.153.0 -- 2.18.0 diff --git a/patches/nuget-client/0005-Remove-unneeded-feeds.patch b/patches/nuget-client/0005-Remove-unneeded-feeds.patch index e007a5f38b..2dcfb0dd2e 100644 --- a/patches/nuget-client/0005-Remove-unneeded-feeds.patch +++ b/patches/nuget-client/0005-Remove-unneeded-feeds.patch @@ -11,16 +11,16 @@ diff --git a/NuGet.Config b/NuGet.Config index fed206f92..245eea2b9 100644 --- a/NuGet.Config +++ b/NuGet.Config -@@ -4,9 +4,7 @@ - - +@@ -7,9 +7,7 @@ + + - - - - - - + + + + -- 2.18.0 diff --git a/patches/nuget-client/0007-build-for-.NET-5.patch b/patches/nuget-client/0007-build-for-.NET-5.patch index c18883cf9d..efa41077e0 100644 --- a/patches/nuget-client/0007-build-for-.NET-5.patch +++ b/patches/nuget-client/0007-build-for-.NET-5.patch @@ -8,12 +8,12 @@ Update netcoreapp TFMs to 5.0. Fix package references to comply with PackageVersions.props overrides. --- build/common.project.props | 5 ++--- - build/packages.targets | 8 +++----- + build/packages.targets | 6 +++--- src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 2 +- - 3 files changed, 6 insertions(+), 9 deletions(-) + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build/common.project.props b/build/common.project.props -index 03c93ae65..f578a2271 100644 +index 704369e09..e5827d77e 100644 --- a/build/common.project.props +++ b/build/common.project.props @@ -13,16 +13,15 @@ @@ -36,33 +36,24 @@ index 03c93ae65..f578a2271 100644 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\ $(RepositoryRootDirectory)build\ diff --git a/build/packages.targets b/build/packages.targets -index 6ea9510dc..19df3657c 100644 +index 03bf7d20b..2d9830a63 100644 --- a/build/packages.targets +++ b/build/packages.targets -@@ -7,8 +7,6 @@ - 16.6.30107.105 - 16.153.0 - 16.7.56 -- -- 5.0.0-preview.3.20214.6 - - - -@@ -64,9 +62,9 @@ - - +@@ -61,9 +61,9 @@ + To resolve runtime assembly binding failures, we'll downgrade the package from 4.11.1 to 4.9.0. + --> -- -- +- +- - -+ + ++ + - - + + diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj -index 4f3ac234c..1ad241531 100644 +index a4647839c..2d29adfee 100644 --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj @@ -4,7 +4,7 @@ @@ -71,7 +62,7 @@ index 4f3ac234c..1ad241531 100644 NuGet's understanding of target frameworks. - $(TargetFrameworksLibrary) + netstandard2.0 - $(TargetFrameworks);net40;net45 + $(TargetFrameworks);net40 $(NoWarn);CS1591;CS1574;CS1573 -- diff --git a/patches/nuget-client/0008-Use-source-built-Microsoft.Web.Xdt.patch b/patches/nuget-client/0008-Use-source-built-Microsoft.Web.Xdt.patch index ab26cb6637..f48d787e18 100644 --- a/patches/nuget-client/0008-Use-source-built-Microsoft.Web.Xdt.patch +++ b/patches/nuget-client/0008-Use-source-built-Microsoft.Web.Xdt.patch @@ -11,8 +11,8 @@ diff --git a/build/packages.targets b/build/packages.targets index 19df3657c..7d8c01f84 100644 --- a/build/packages.targets +++ b/build/packages.targets -@@ -9,6 +9,10 @@ - 16.7.56 +@@ -8,6 +8,10 @@ + 5.0.0 + @@ -22,15 +22,15 @@ index 19df3657c..7d8c01f84 100644 2.4.1 -@@ -58,7 +62,7 @@ - - +@@ -52,7 +56,7 @@ + -- + +- + - - + + - true --- -1.8.3.1 - diff --git a/patches/roslyn/0012-Build-Roslyn-as-net5.0-in-source-build.patch b/patches/roslyn/0012-Build-Roslyn-as-net5.0-in-source-build.patch index 06358cb473..cdc24da3dd 100644 --- a/patches/roslyn/0012-Build-Roslyn-as-net5.0-in-source-build.patch +++ b/patches/roslyn/0012-Build-Roslyn-as-net5.0-in-source-build.patch @@ -70,7 +70,7 @@ index 1cad2918891..a7e80667b4a 100644 +++ b/eng/Versions.props @@ -25,6 +25,10 @@ - 3.8.0-2.20414.4 + 3.9.0-4.21076.10 + + netcoreapp3.1 @@ -78,7 +78,7 @@ index 1cad2918891..a7e80667b4a 100644 + - 3.3.0-beta1.20352.4 + 3.3.2-beta1.20562.1 diff --git a/src/Compilers/CSharp/csc/csc.csproj b/src/Compilers/CSharp/csc/csc.csproj index 01e6741bb09..0d1b86f4a69 100644 --- a/src/Compilers/CSharp/csc/csc.csproj diff --git a/patches/sdk/0003-Conditionally-include-PrecompileScript.patch b/patches/sdk/0003-Conditionally-include-PrecompileScript.patch index a4a3bbc411..87c464d21d 100644 --- a/patches/sdk/0003-Conditionally-include-PrecompileScript.patch +++ b/patches/sdk/0003-Conditionally-include-PrecompileScript.patch @@ -15,8 +15,8 @@ index da033cd6b..ab7ff3133 100644 -- -+ +- ++ +Date: Wed, 24 Mar 2021 19:48:46 +0000 +Subject: [PATCH] Add slnf file for source-build + +--- + source-build.slnf | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + create mode 100644 source-build.slnf + +diff --git a/source-build.slnf b/source-build.slnf +new file mode 100644 +index 000000000..845a61e86 +--- /dev/null ++++ b/source-build.slnf +@@ -0,0 +1,36 @@ ++{ ++ "solution": { ++ "path": "sdk.sln", ++ "projects": [ ++ "src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks\\Microsoft.NET.Build.Extensions.Tasks.csproj", ++ "src\\Tasks\\Microsoft.NET.Build.Tasks\\Microsoft.NET.Build.Tasks.csproj", ++ "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj", ++ "src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj", ++ "src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj", ++ "src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj", ++ "src\\Cli\\dotnet\\dotnet.csproj", ++ "src\\Layout\\tool_fsharp\\tool_fsc.csproj", ++ "src\\Layout\\tool_msbuild\\tool_msbuild.csproj", ++ "src\\Layout\\tool_nuget\\tool_nuget.csproj", ++ "src\\Layout\\redist\\redist.csproj", ++ "src\\Layout\\toolset-tasks\\toolset-tasks.csproj", ++ "src\\WebSdk\\ProjectSystem\\Tasks\\Microsoft.NET.Sdk.Web.ProjectSystem.Tasks.csproj", ++ "src\\WebSdk\\Publish\\Tasks\\Microsoft.NET.Sdk.Publish.Tasks.csproj", ++ "src\\WebSdk\\Web\\Tasks\\Microsoft.NET.Sdk.Web.Tasks.csproj", ++ "src\\WebSdk\\Worker\\Tasks\\Microsoft.NET.Sdk.Worker.Tasks.csproj", ++ "src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj", ++ "src\\Tests\\Microsoft.DotNet.TemplateLocator.Tests\\Microsoft.DotNet.TemplateLocator.Tests.csproj", ++ "src\\Resolvers\\Microsoft.DotNet.MSBuildSdkResolver\\Microsoft.DotNet.MSBuildSdkResolver.csproj", ++ "src\\Resolvers\\Microsoft.DotNet.SdkResolver\\Microsoft.DotNet.SdkResolver.csproj", ++ "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadManifestReader\\Microsoft.NET.Sdk.WorkloadManifestReader.csproj", ++ "src\\Resolvers\\WorkloadManifestValidator\\WorkloadManifestValidator.csproj", ++ "src\\Tests\\Microsoft.NET.Sdk.WorkloadManifestReader.Tests\\Microsoft.NET.Sdk.WorkloadManifestReader.Tests.csproj", ++ "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj", ++ "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj", ++ "src\\BuiltInTools\\BrowserRefresh\\Microsoft.AspNetCore.Watch.BrowserRefresh.csproj", ++ "src\\Tests\\dotnet-watch.Tests\\dotnet-watch.Tests.csproj", ++ "src\\Tests\\Microsoft.AspNetCore.Watch.BrowserRefresh.Tests\\Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj", ++ "src\\BuiltInTools\\DotNetWatchTasks\\DotNetWatchTasks.csproj" ++ ] ++ } ++} +-- +2.25.4 + diff --git a/patches/vstest/0001-Update-vstest-build-script-to-add-binlogs.patch b/patches/vstest/0001-Update-vstest-build-script-to-add-binlogs.patch index 981e780901..23b761ff6e 100644 --- a/patches/vstest/0001-Update-vstest-build-script-to-add-binlogs.patch +++ b/patches/vstest/0001-Update-vstest-build-script-to-add-binlogs.patch @@ -4,8 +4,8 @@ Date: Tue, 13 Aug 2019 21:57:28 +0000 Subject: [PATCH 1/7] Update vstest build script to add binlogs --- - scripts/build.sh | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + scripts/build.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index fe0797be..824e5e16 100755 @@ -20,16 +20,7 @@ index fe0797be..824e5e16 100755 fi if [ "$failed" = true ]; then -@@ -244,7 +244,7 @@ function invoke_build() - if [[ $TP_USE_REPO_API = 0 ]]; then - $dotnet build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild || failed=true - else -- $dotnet build $TPB_Build_From_Source_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -p:DotNetBuildFromSource=true || failed=true -+ $dotnet build $TPB_Build_From_Source_Solution /bl:build.binlog --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -p:DotNetBuildFromSource=true || failed=true - fi - else - find . -name "$PROJECT_NAME_PATTERNS" | xargs -L 1 $dotnet build --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -@@ -293,7 +293,7 @@ function publish_package() +@@ -296,7 +296,7 @@ function publish_package() for project in "${projects[@]}" ; do log ".. Package: Publish $project" @@ -38,7 +29,7 @@ index fe0797be..824e5e16 100755 done # Copy TestHost for desktop targets -@@ -327,7 +327,7 @@ function publish_package() +@@ -330,7 +330,7 @@ function publish_package() log ".. Package: Publish testhost.csproj" local projectToPackage=$TP_ROOT_DIR/src/testhost/testhost.csproj local packageOutputPath=$TP_OUT_DIR/$TPB_Configuration/Microsoft.TestPlatform.TestHost/$TPB_TargetFrameworkCore @@ -47,7 +38,7 @@ index fe0797be..824e5e16 100755 # For libraries that are externally published, copy the output into artifacts. These will be signed and packaged independently. packageName="Microsoft.TestPlatform.Build" -@@ -390,7 +390,7 @@ function create_package() +@@ -395,7 +395,7 @@ function create_package() for i in ${projectFiles[@]}; do log "$dotnet pack --no-build $stagingDir/${i} -o $packageOutputDir -p:Version=$TPB_Version" \ && $dotnet restore $stagingDir/${i} \ diff --git a/patches/vstest/0003-Update-the-license-for-nuget-packages-to-point-to-MI.patch b/patches/vstest/0003-Update-the-license-for-nuget-packages-to-point-to-MI.patch index 3702f95bdb..33a5a7cffc 100644 --- a/patches/vstest/0003-Update-the-license-for-nuget-packages-to-point-to-MI.patch +++ b/patches/vstest/0003-Update-the-license-for-nuget-packages-to-point-to-MI.patch @@ -1,152 +1,291 @@ -From 46f7e463bb933c5fbe1148c7098e276676eae87d Mon Sep 17 00:00:00 2001 -From: Sarabjot Singh -Date: Wed, 11 Sep 2019 13:24:09 +0530 -Subject: [PATCH 3/7] Update the license for nuget packages to point to MIT - license +From 48405ce000a6ce7e6115a48423626562d2311343 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Thu, 25 Mar 2021 14:32:46 +0000 +Subject: [PATCH] Update the license for nuget packages to point to MIT license --- - src/package/nuspec/Microsoft.CodeCoverage.nuspec | 2 +- - src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec | 2 +- - src/package/nuspec/TestPlatform.Build.nuspec | 2 +- - src/package/nuspec/TestPlatform.CLI.nuspec | 2 +- - src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec | 2 +- - src/package/nuspec/TestPlatform.ObjectModel.nuspec | 2 +- - src/package/nuspec/TestPlatform.TestHost.nuspec | 2 +- - src/package/nuspec/TestPlatform.TranslationLayer.nuspec | 2 +- - .../Microsoft.TestPlatform.Asset.NativeCPP.nuspec | 2 +- - .../Microsoft.TestPlatform.QTools.Assets.nuspec | 2 +- - 10 files changed, 10 insertions(+), 10 deletions(-) + src/package/licenses/LICENSE_MIT.txt | 19 +++++++++++++++++++ + .../nuspec/Microsoft.CodeCoverage.nuspec | 4 ++-- + .../nuspec/Microsoft.NET.Test.Sdk.nuspec | 4 ++-- + ...osoft.TestPlatform.AdapterUtilities.nuspec | 4 ++-- + src/package/nuspec/TestPlatform.Build.nuspec | 4 ++-- + src/package/nuspec/TestPlatform.CLI.nuspec | 4 ++-- + .../TestPlatform.Extensions.TrxLogger.nuspec | 4 ++-- + .../nuspec/TestPlatform.ObjectModel.nuspec | 4 ++-- + .../nuspec/TestPlatform.TestHost.nuspec | 4 ++-- + .../TestPlatform.TranslationLayer.nuspec | 4 ++-- + ...rosoft.TestPlatform.Asset.NativeCPP.nuspec | 4 ++-- + ...icrosoft.TestPlatform.QTools.Assets.nuspec | 4 ++-- + 12 files changed, 41 insertions(+), 22 deletions(-) + create mode 100644 src/package/licenses/LICENSE_MIT.txt +diff --git a/src/package/licenses/LICENSE_MIT.txt b/src/package/licenses/LICENSE_MIT.txt +new file mode 100644 +index 00000000..a31c5558 +--- /dev/null ++++ b/src/package/licenses/LICENSE_MIT.txt +@@ -0,0 +1,19 @@ ++Copyright (c) 2020 Microsoft Corporation ++ ++Permission is hereby granted, free of charge, to any person obtaining a copy ++of this software and associated documentation files (the "Software"), to deal ++in the Software without restriction, including without limitation the rights ++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++copies of the Software, and to permit persons to whom the Software is ++furnished to do so, subject to the following conditions: ++ ++The above copyright notice and this permission notice shall be included in all ++copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++SOFTWARE. diff --git a/src/package/nuspec/Microsoft.CodeCoverage.nuspec b/src/package/nuspec/Microsoft.CodeCoverage.nuspec -index ea186254..675d2969 100644 +index 2bd731e6..fa4a090c 100644 --- a/src/package/nuspec/Microsoft.CodeCoverage.nuspec +++ b/src/package/nuspec/Microsoft.CodeCoverage.nuspec @@ -8,7 +8,7 @@ Microsoft true Microsoft.CodeCoverage package brings infra for collecting code coverage from vstest.console.exe and "dotnet test". -- http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm -+ https://github.com/microsoft/vstest/blob/master/LICENSE +- LICENSE_NET.txt ++ LICENSE_MIT.txt http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png https://github.com/microsoft/vstest/ - © Microsoft Corporation. All rights reserved. +@@ -27,7 +27,7 @@ + + + +- ++ + + + diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec -index aef09290..387e279f 100644 +index 7727e083..a2073997 100644 --- a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec +++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec @@ -7,7 +7,7 @@ Microsoft Microsoft true -- http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm -+ https://github.com/microsoft/vstest/blob/master/LICENSE +- LICENSE_NET.txt ++ LICENSE_MIT.txt http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png The MSbuild targets and properties for building .NET test projects. - © Microsoft Corporation. All rights reserved. +@@ -44,7 +44,7 @@ + + + +- ++ + + + +diff --git a/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec b/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec +index 84b41b83..6fb05bc8 100644 +--- a/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec ++++ b/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec +@@ -10,7 +10,7 @@ + + Includes helpers for the Test Platform's modern functionality such as standardized fully qualified names and hierarchical test case names. + +- LICENSE_NET.txt ++ LICENSE_MIT.txt + http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png + https://github.com/microsoft/vstest/ +@@ -38,7 +38,7 @@ + + + +- ++ + + + diff --git a/src/package/nuspec/TestPlatform.Build.nuspec b/src/package/nuspec/TestPlatform.Build.nuspec -index 92c0d9d7..5230aa5d 100644 +index 3808b296..9e0551f9 100644 --- a/src/package/nuspec/TestPlatform.Build.nuspec +++ b/src/package/nuspec/TestPlatform.Build.nuspec @@ -8,7 +8,7 @@ Microsoft true Build tasks and targets for running tests with Test Platform -- http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm -+ https://github.com/microsoft/vstest/blob/master/LICENSE +- LICENSE_NET.txt ++ LICENSE_MIT.txt http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png https://github.com/microsoft/vstest/ - © Microsoft Corporation. All rights reserved. +@@ -25,7 +25,7 @@ + + + +- ++ + + + diff --git a/src/package/nuspec/TestPlatform.CLI.nuspec b/src/package/nuspec/TestPlatform.CLI.nuspec -index ce0da806..ca995ffc 100644 +index 0e72bf58..9a2d4eae 100644 --- a/src/package/nuspec/TestPlatform.CLI.nuspec +++ b/src/package/nuspec/TestPlatform.CLI.nuspec @@ -8,7 +8,7 @@ Microsoft true The cross platform Microsoft Test Platform. -- http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm -+ https://github.com/microsoft/vstest/blob/master/LICENSE +- LICENSE_NET.txt ++ LICENSE_MIT.txt http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png https://github.com/microsoft/vstest/ - © Microsoft Corporation. All rights reserved. +@@ -25,7 +25,7 @@ + + + +- ++ + + + diff --git a/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec b/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec -index 4ff5a3cb..247d7b4c 100644 +index 802ce1eb..fb97bda1 100644 --- a/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec +++ b/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec @@ -8,7 +8,7 @@ Microsoft true C# SDK for the test platform protocol. This SDK can be used in IDE or Editors to use test platform for discovery and execution of tests. -- http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm -+ https://github.com/microsoft/vstest/blob/master/LICENSE +- LICENSE_NET.txt ++ LICENSE_MIT.txt http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png https://github.com/microsoft/vstest/ - © Microsoft Corporation. All rights reserved. +@@ -40,7 +40,7 @@ + + + +- ++ + + + diff --git a/src/package/nuspec/TestPlatform.ObjectModel.nuspec b/src/package/nuspec/TestPlatform.ObjectModel.nuspec -index 342628c0..2d743fda 100644 +index 80d194f2..b418e89f 100644 --- a/src/package/nuspec/TestPlatform.ObjectModel.nuspec +++ b/src/package/nuspec/TestPlatform.ObjectModel.nuspec @@ -8,7 +8,7 @@ Microsoft true The Microsoft Test Platform Object Model. -- http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm -+ https://github.com/microsoft/vstest/blob/master/LICENSE +- LICENSE_NET.txt ++ LICENSE_MIT.txt http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png https://github.com/microsoft/vstest/ - © Microsoft Corporation. All rights reserved. +@@ -83,7 +83,7 @@ + + + +- ++ + + + diff --git a/src/package/nuspec/TestPlatform.TestHost.nuspec b/src/package/nuspec/TestPlatform.TestHost.nuspec -index d2f1343f..58fc6fbb 100644 +index 86a4edea..6ff1ae1e 100644 --- a/src/package/nuspec/TestPlatform.TestHost.nuspec +++ b/src/package/nuspec/TestPlatform.TestHost.nuspec @@ -8,7 +8,7 @@ Microsoft true Testplatform host executes the test using specified adapter. -- http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm -+ https://github.com/microsoft/vstest/blob/master/LICENSE +- LICENSE_NET.txt ++ LICENSE_MIT.txt http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png https://github.com/microsoft/vstest/ - © Microsoft Corporation. All rights reserved. +@@ -50,7 +50,7 @@ + + + +- ++ + + + diff --git a/src/package/nuspec/TestPlatform.TranslationLayer.nuspec b/src/package/nuspec/TestPlatform.TranslationLayer.nuspec -index ad12872f..aed4c354 100644 +index 420efde6..d934d594 100644 --- a/src/package/nuspec/TestPlatform.TranslationLayer.nuspec +++ b/src/package/nuspec/TestPlatform.TranslationLayer.nuspec @@ -8,7 +8,7 @@ Microsoft true C# SDK for the test platform protocol. This SDK can be used in IDE or Editors to use test platform for discovery and execution of tests. -- http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm -+ https://github.com/microsoft/vstest/blob/master/LICENSE +- LICENSE_NET.txt ++ LICENSE_MIT.txt http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png https://github.com/microsoft/vstest/ - © Microsoft Corporation. All rights reserved. +@@ -37,7 +37,7 @@ + + + +- ++ + + + diff --git a/test/TestAssets/CPPSimpleTestProject/Microsoft.TestPlatform.Asset.NativeCPP.nuspec b/test/TestAssets/CPPSimpleTestProject/Microsoft.TestPlatform.Asset.NativeCPP.nuspec -index 1aa97e69..bdc242a6 100644 +index b2df3444..76685c82 100644 --- a/test/TestAssets/CPPSimpleTestProject/Microsoft.TestPlatform.Asset.NativeCPP.nuspec +++ b/test/TestAssets/CPPSimpleTestProject/Microsoft.TestPlatform.Asset.NativeCPP.nuspec @@ -7,7 +7,7 @@ Microsoft Microsoft false -- http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm -+ https://github.com/microsoft/vstest/blob/master/LICENSE +- LICENSE_NET.txt ++ LICENSE_MIT.txt http://go.microsoft.com/fwlink/?LinkID=288859 MSDia typelib for reading debug symbols from managed code. Copyright © Microsoft Corporation +@@ -17,7 +17,7 @@ + + + +- ++ + + + diff --git a/test/TestAssets/QualityToolsAssets/Microsoft.TestPlatform.QTools.Assets.nuspec b/test/TestAssets/QualityToolsAssets/Microsoft.TestPlatform.QTools.Assets.nuspec -index 55ac1c42..f4c453e2 100644 +index 1090df2b..1e4a82ce 100644 --- a/test/TestAssets/QualityToolsAssets/Microsoft.TestPlatform.QTools.Assets.nuspec +++ b/test/TestAssets/QualityToolsAssets/Microsoft.TestPlatform.QTools.Assets.nuspec @@ -7,7 +7,7 @@ Microsoft Microsoft false -- http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm -+ https://github.com/microsoft/vstest/blob/master/LICENSE +- LICENSE_NET.txt ++ LICENSE_MIT.txt http://go.microsoft.com/fwlink/?LinkID=288859 MSDia typelib for reading debug symbols from managed code. Copyright © Microsoft Corporation +@@ -17,7 +17,7 @@ + + + +- ++ + + + -- -2.18.2 +2.25.4 diff --git a/patches/vstest/0005-Remove-runtime-identifier-from-vstest-projects.patch b/patches/vstest/0005-Remove-runtime-identifier-from-vstest-projects.patch index 279808fcca..e3e8b640cd 100644 --- a/patches/vstest/0005-Remove-runtime-identifier-from-vstest-projects.patch +++ b/patches/vstest/0005-Remove-runtime-identifier-from-vstest-projects.patch @@ -8,18 +8,18 @@ Subject: [PATCH] Remove runtime identifier from vstest projects 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj -index 535a6e6a..d2199dc0 100644 +index b8bdf9fc..b985ab13 100644 --- a/src/testhost.x86/testhost.x86.csproj +++ b/src/testhost.x86/testhost.x86.csproj -@@ -13,7 +13,7 @@ - true - Exe +@@ -17,7 +17,7 @@ app.manifest + + - win7-x86 + win7-x86 false + $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 - -- 2.26.2 1.8.3.1 diff --git a/patches/vstest/0006-build-for-.NET-5.patch b/patches/vstest/0006-build-for-.NET-5.patch index 1306af46df..20064d942a 100644 --- a/patches/vstest/0006-build-for-.NET-5.patch +++ b/patches/vstest/0006-build-for-.NET-5.patch @@ -5,7 +5,7 @@ Subject: [PATCH] vstest: build for .NET 5 --- scripts/build.sh | 4 ++-- - .../Microsoft.TestPlatform.PlatformAbstractions.csproj | 6 +++++- + .../Microsoft.TestPlatform.PlatformAbstractions.csproj | 2 +- .../Hosting/DotnetTestHostManager.cs | 2 +- src/datacollector/datacollector.csproj | 2 +- src/package/nuspec/Microsoft.TestPlatform.Build.csproj | 2 +- @@ -14,9 +14,8 @@ Subject: [PATCH] vstest: build for .NET 5 src/package/package/package.csproj | 2 +- src/testhost.x86/testhost.x86.csproj | 2 +- src/testhost/testhost.csproj | 5 +++-- - src/vstest.console/CommandLine/CommandLineOptions.cs | 4 ++-- src/vstest.console/vstest.console.csproj | 5 +++-- - 12 files changed, 22 insertions(+), 16 deletions(-) + 11 files changed, 16 insertions(+), 14 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index e4454a5d..a8dcbddb 100755 @@ -44,26 +43,15 @@ diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatf index e112259a..73b35c87 100644 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj -@@ -7,7 +7,7 @@ - - Microsoft.TestPlatform.PlatformAbstractions - netcoreapp2.1;net451;uap10.0;netstandard2.0 -- netstandard2.0;netcoreapp2.1 +@@ -10,7 +10,7 @@ + Microsoft.TestPlatform.PlatformAbstractions + net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0 + $(TargetFrameworks);uap10.0;netstandard1.0 +- netstandard1.0;netstandard1.3;netstandard2.0;netcoreapp2.1 + netstandard2.0;net5.0 - false true - NU1605 -@@ -35,6 +35,10 @@ - - - -+ -+ -+ -+ - - - + + diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs index eb4149d6..33a13411 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs @@ -81,14 +69,14 @@ diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacoll index 24e3df7c..bb6d3631 100644 --- a/src/datacollector/datacollector.csproj +++ b/src/datacollector/datacollector.csproj -@@ -10,7 +10,7 @@ - - datacollector - netcoreapp2.1;net472 +@@ -12,7 +12,7 @@ + netcoreapp2.1 + $(TargetFrameworks);net472 + $(TargetFrameworks);net451 - netcoreapp2.1 + net5.0 true - AnyCPU + AnyCPU Exe diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj index fdc693f5..c9bc263e 100644 @@ -145,11 +133,11 @@ diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x8 index 535a6e6a..a3ef5cee 100644 --- a/src/testhost.x86/testhost.x86.csproj +++ b/src/testhost.x86/testhost.x86.csproj -@@ -7,7 +7,7 @@ +@@ -9,7 +9,7 @@ testhost.x86 - netcoreapp2.1;net451;net452;net46;net461;net462;net47;net471;net472;net48 -- netcoreapp2.1 + netcoreapp2.1;netcoreapp1.0;net451;net452;net46;net461;net462;net47;net471;net472;net48 +- netcoreapp2.1;netcoreapp1.0 + net5.0 true AnyCPU @@ -158,42 +146,21 @@ diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj index c239485d..152b8ae0 100644 --- a/src/testhost/testhost.csproj +++ b/src/testhost/testhost.csproj -@@ -7,11 +7,12 @@ +@@ -9,11 +9,12 @@ testhost - netcoreapp2.1;net451;net452;net46;net461;net462;net47;net471;net472;net48 -- netcoreapp2.1 + netcoreapp2.1;netcoreapp1.0;net451;net452;net46;net461;net462;net47;net471;net472;net48 +- netcoreapp2.1;netcoreapp1.0 + net5.0 + net5.0 Exe app.manifest -- +- + win7-x64 false - -diff --git a/src/vstest.console/CommandLine/CommandLineOptions.cs b/src/vstest.console/CommandLine/CommandLineOptions.cs -index 64d21204..9c25faf8 100644 ---- a/src/vstest.console/CommandLine/CommandLineOptions.cs -+++ b/src/vstest.console/CommandLine/CommandLineOptions.cs -@@ -295,14 +295,14 @@ namespace Microsoft.VisualStudio.TestPlatform.CommandLine - // Get matching files from file pattern parser - matchingFiles = FilePatternParser.GetMatchingFiles(source); - } -- catch(TestSourceException ex) -+ catch(TestSourceException) - { - if(source.StartsWith("-") || source.StartsWith("/")) - { - throw new TestSourceException( - string.Format(CultureInfo.CurrentUICulture, CommandLineResources.InvalidArgument, source)); - } -- throw ex; -+ throw; - } - // Add the matching files to source list - this.sources = this.sources.Union(matchingFiles).ToList(); + $(AssemblyName).$(TargetFramework) diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj index ea970a60..f7448391 100644 --- a/src/vstest.console/vstest.console.csproj diff --git a/patches/vstest/0007-Use-Microsoft.Diagnostics.NETCore.Client-from-PVP.patch b/patches/vstest/0007-Use-Microsoft.Diagnostics.NETCore.Client-from-PVP.patch index 95bd64ebd7..639a91171d 100644 --- a/patches/vstest/0007-Use-Microsoft.Diagnostics.NETCore.Client-from-PVP.patch +++ b/patches/vstest/0007-Use-Microsoft.Diagnostics.NETCore.Client-from-PVP.patch @@ -25,15 +25,15 @@ diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft. index 11a26e7f..3592917f 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj -@@ -32,7 +32,7 @@ +@@ -34,7 +34,7 @@ + - -- 0.2.0-preview.20419.2 -+ $(MicrosoftDiagnosticsNETCoreClientVersion) - +- ++ + -- 2.25.2 diff --git a/repos/sdk.proj b/repos/sdk.proj index 2da73f36e3..6d9a4d1fd0 100644 --- a/repos/sdk.proj +++ b/repos/sdk.proj @@ -16,6 +16,7 @@ $(BuildCommandArgs) -ci $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) + $(BuildCommandArgs) /p:Projects=$(ProjectDirectory)source-build.slnf + netcoreapp3.1;netstandard2.0 +- Exe ++ Exe + $(RoslynPortableRuntimeIdentifiers) + false + false + + + +- +- +- +- ++ ++ ++ ++ + + + +- +\ No newline at end of file ++ +-- +2.21.3 + From cb1fe5e6d83e38113a31e21aaf33ff389de57265 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 25 Mar 2021 20:13:30 +0000 Subject: [PATCH 10/36] Update msbuild to use slnf file --- repos/msbuild.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/msbuild.proj b/repos/msbuild.proj index d65316e45c..d635daa70f 100644 --- a/repos/msbuild.proj +++ b/repos/msbuild.proj @@ -11,7 +11,7 @@ $(BuildCommandArgs) /p:DotNetBuildFromSource=true $(BuildCommandArgs) /p:DotNetCoreSdkDir=$(DotNetCliToolDir) $(BuildCommandArgs) --configuration $(Configuration) - $(BuildCommandArgs) --projects $(ProjectDirectory)MSBuild.SourceBuild.sln + $(BuildCommandArgs) --projects $(ProjectDirectory)MSBuild.SourceBuild.slnf $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(BuildCommandArgs) $(OutputVersionArgs) $(BuildCommandArgs) /p:DotNetPackageVersionPropsPath=$(PackageVersionPropsPath) From 6269476eb253fbb3fa267c3e28f6a5cf231fa741 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Tue, 30 Mar 2021 16:08:18 -0500 Subject: [PATCH 11/36] Update PAT for cloning internal repos --- .vsts.pipelines/jobs/ci-linux.yml | 2 +- .vsts.pipelines/jobs/ci-local.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts.pipelines/jobs/ci-linux.yml b/.vsts.pipelines/jobs/ci-linux.yml index a257402a16..cba5ab26fa 100644 --- a/.vsts.pipelines/jobs/ci-linux.yml +++ b/.vsts.pipelines/jobs/ci-linux.yml @@ -81,7 +81,7 @@ jobs: /p:FailOnPrebuiltBaselineError=$failOnBaselineError \ /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) \ $(tarballDownloadArgs) \ - /p:AzDoPat=$(System.AccessToken) + /p:AzDoPat=$(dn-bot-devdiv-build-rw-code-rw) du -h $(rootDirectory) | sort -h | tail -n 50 displayName: Build source-build timeoutInMinutes: 180 diff --git a/.vsts.pipelines/jobs/ci-local.yml b/.vsts.pipelines/jobs/ci-local.yml index 379f04e741..72f66cb85f 100644 --- a/.vsts.pipelines/jobs/ci-local.yml +++ b/.vsts.pipelines/jobs/ci-local.yml @@ -25,7 +25,7 @@ jobs: /p:BuildPortableSdk=$(sb.portable) /p:FailOnPrebuiltBaselineError=$(failOnPrebuiltBaselineError) /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) - /p:AzDoPat=$(System.AccessToken) + /p:AzDoPat=$(dn-bot-devdiv-build-rw-code-rw) $(tarballDownloadArgs) args.smokeTest: > --run-smoke-test From 74a2f05082373f9438891aa6d7d6a9412ad861af Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Tue, 30 Mar 2021 16:39:35 -0500 Subject: [PATCH 12/36] Update PAT again --- .vsts.pipelines/jobs/ci-linux.yml | 2 +- .vsts.pipelines/jobs/ci-local.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts.pipelines/jobs/ci-linux.yml b/.vsts.pipelines/jobs/ci-linux.yml index cba5ab26fa..46196b9be7 100644 --- a/.vsts.pipelines/jobs/ci-linux.yml +++ b/.vsts.pipelines/jobs/ci-linux.yml @@ -81,7 +81,7 @@ jobs: /p:FailOnPrebuiltBaselineError=$failOnBaselineError \ /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) \ $(tarballDownloadArgs) \ - /p:AzDoPat=$(dn-bot-devdiv-build-rw-code-rw) + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) du -h $(rootDirectory) | sort -h | tail -n 50 displayName: Build source-build timeoutInMinutes: 180 diff --git a/.vsts.pipelines/jobs/ci-local.yml b/.vsts.pipelines/jobs/ci-local.yml index 72f66cb85f..ff012c21a5 100644 --- a/.vsts.pipelines/jobs/ci-local.yml +++ b/.vsts.pipelines/jobs/ci-local.yml @@ -25,7 +25,7 @@ jobs: /p:BuildPortableSdk=$(sb.portable) /p:FailOnPrebuiltBaselineError=$(failOnPrebuiltBaselineError) /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) - /p:AzDoPat=$(dn-bot-devdiv-build-rw-code-rw) + /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw) $(tarballDownloadArgs) args.smokeTest: > --run-smoke-test From d3850cd5d0db924f3cf427e7f4ffcff84aa16ca4 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 1 Apr 2021 15:22:00 -0500 Subject: [PATCH 13/36] Patch roslyn-analyzers for ambiguous ref and remove bad installer patch. --- ...ILD_SKIP_BUNDLEDDOTNETTOOLS-property.patch | 23 ------------------ .../0012-Fix-ambiguous-reference.patch | 24 +++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 patches/installer/0009-Restore-CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS-property.patch create mode 100644 patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch diff --git a/patches/installer/0009-Restore-CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS-property.patch b/patches/installer/0009-Restore-CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS-property.patch deleted file mode 100644 index b8420372c8..0000000000 --- a/patches/installer/0009-Restore-CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS-property.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4463ac79852a962c1b41188ead601cf2052c6dfd Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Sat, 13 Mar 2021 14:21:20 -0600 -Subject: [PATCH 9/9] Restore CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS property. - ---- - src/redist/targets/BundledDotnetTools.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/redist/targets/BundledDotnetTools.targets b/src/redist/targets/BundledDotnetTools.targets -index 0b5b202e0..0d3cc2e8c 100644 ---- a/src/redist/targets/BundledDotnetTools.targets -+++ b/src/redist/targets/BundledDotnetTools.targets -@@ -1,5 +1,5 @@ - -- -+ - - - --- -2.18.0 - diff --git a/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch b/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch new file mode 100644 index 0000000000..84f0cae35d --- /dev/null +++ b/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch @@ -0,0 +1,24 @@ +From 99a8cba01d7cd210e09e717973fd84b99cdd3a5f Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 1 Apr 2021 15:18:25 -0500 +Subject: [PATCH 12/12] Fix ambiguous reference. + +--- + .../CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs b/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs +index cc0e65411..99fcd8571 100644 +--- a/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs ++++ b/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs +@@ -5,7 +5,6 @@ + using Microsoft.CodeAnalysis; + using Microsoft.CodeAnalysis.CodeFixes; + using Roslyn.Diagnostics.Analyzers; +-using StyleCop.Analyzers.Helpers; + + namespace Roslyn.Diagnostics.CSharp.Analyzers.WrapStatements + { +-- +2.18.0 + From 235b7e6595eab7ca22871cceb4a013d43f608d5c Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 1 Apr 2021 17:47:14 -0500 Subject: [PATCH 14/36] Went the wrong way. --- .../0012-Fix-ambiguous-reference.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch b/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch index 84f0cae35d..7684b0219f 100644 --- a/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch +++ b/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch @@ -1,6 +1,6 @@ -From 99a8cba01d7cd210e09e717973fd84b99cdd3a5f Mon Sep 17 00:00:00 2001 +From 1d441b6136ba0325b740665807f7783f90713b92 Mon Sep 17 00:00:00 2001 From: Chris Rummel -Date: Thu, 1 Apr 2021 15:18:25 -0500 +Date: Thu, 1 Apr 2021 17:46:44 -0500 Subject: [PATCH 12/12] Fix ambiguous reference. --- @@ -8,17 +8,17 @@ Subject: [PATCH 12/12] Fix ambiguous reference. 1 file changed, 1 deletion(-) diff --git a/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs b/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs -index cc0e65411..99fcd8571 100644 +index cc0e65411..302051f4d 100644 --- a/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs +++ b/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs -@@ -5,7 +5,6 @@ +@@ -3,7 +3,6 @@ + using System.Collections.Immutable; + using System.Threading.Tasks; using Microsoft.CodeAnalysis; - using Microsoft.CodeAnalysis.CodeFixes; +-using Microsoft.CodeAnalysis.CodeFixes; using Roslyn.Diagnostics.Analyzers; --using StyleCop.Analyzers.Helpers; + using StyleCop.Analyzers.Helpers; - namespace Roslyn.Diagnostics.CSharp.Analyzers.WrapStatements - { -- 2.18.0 From ddd53c2e7d139c320f6b485176c6066ae271ba64 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 2 Apr 2021 00:10:04 -0500 Subject: [PATCH 15/36] Another couple fixes for roslyn-analyzer --- .../0012-Fix-ambiguous-reference.patch | 67 ++++++++++++++++--- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch b/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch index 7684b0219f..e86d1d2f96 100644 --- a/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch +++ b/patches/roslyn-analyzers/0012-Fix-ambiguous-reference.patch @@ -1,24 +1,69 @@ -From 1d441b6136ba0325b740665807f7783f90713b92 Mon Sep 17 00:00:00 2001 +From adabb4c0fc30a367055e13a3fbff00784310e496 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 1 Apr 2021 17:46:44 -0500 Subject: [PATCH 12/12] Fix ambiguous reference. --- - .../CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs | 1 - - 1 file changed, 1 deletion(-) + .../Maintainability/CodeMetricsAnalyzer.cs | 10 +++++----- + .../CSharpBracePlacementFixAllProvider.cs | 2 +- + .../CSharpWrapStatementsFixAllProvider.cs | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) +diff --git a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/CodeMetricsAnalyzer.cs b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/CodeMetricsAnalyzer.cs +index a15e8a073..351d459e1 100644 +--- a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/CodeMetricsAnalyzer.cs ++++ b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/CodeMetricsAnalyzer.cs +@@ -316,13 +316,13 @@ static bool isApplicableByDefault(string ruleId, SymbolKind symbolKind) + // Compat: we match the default threshold values for old FxCop implementation. + return ruleId switch + { +- CA1501RuleId => 5, ++ CA1501RuleId => (uint)5, + +- CA1502RuleId => 25, ++ CA1502RuleId => (uint)25, + +- CA1505RuleId => 10, ++ CA1505RuleId => (uint)10, + +- CA1506RuleId => symbolKind == SymbolKind.NamedType ? 95 : 40, ++ CA1506RuleId => symbolKind == SymbolKind.NamedType ? (uint)95 : (uint)40, + + _ => throw new NotImplementedException(), + }; +@@ -505,4 +505,4 @@ private static int GetDistinctContainingNamespacesCount(IEnumerable RoslynDiagnosticsAnalyzersResources.Remove_blank_lines_between_braces; diff --git a/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs b/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs -index cc0e65411..302051f4d 100644 +index cc0e65411..8bdd97369 100644 --- a/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs +++ b/src/Roslyn.Diagnostics.Analyzers/CSharp/WrapStatements/CSharpWrapStatementsFixAllProvider.cs -@@ -3,7 +3,6 @@ - using System.Collections.Immutable; - using System.Threading.Tasks; - using Microsoft.CodeAnalysis; --using Microsoft.CodeAnalysis.CodeFixes; - using Roslyn.Diagnostics.Analyzers; - using StyleCop.Analyzers.Helpers; +@@ -9,7 +9,7 @@ + namespace Roslyn.Diagnostics.CSharp.Analyzers.WrapStatements + { +- internal class CSharpWrapStatementsFixAllProvider : DocumentBasedFixAllProvider ++ internal class CSharpWrapStatementsFixAllProvider : StyleCop.Analyzers.Helpers.DocumentBasedFixAllProvider + { + protected override string CodeActionTitle + => RoslynDiagnosticsAnalyzersResources.Place_statement_on_following_line; -- 2.18.0 From 9f815c3534bb2bc787f81f955146e07116bb49f3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 2 Apr 2021 15:02:26 +0000 Subject: [PATCH 16/36] Add aspnetcore nullable patch --- .../0020-Disable-nullable-warnings.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 patches/aspnetcore/0020-Disable-nullable-warnings.patch diff --git a/patches/aspnetcore/0020-Disable-nullable-warnings.patch b/patches/aspnetcore/0020-Disable-nullable-warnings.patch new file mode 100644 index 0000000000..2e225a5592 --- /dev/null +++ b/patches/aspnetcore/0020-Disable-nullable-warnings.patch @@ -0,0 +1,28 @@ +From c70232268e76633ee9bb1c5c384890bdc46c90e5 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Fri, 2 Apr 2021 16:18:27 +0000 +Subject: [PATCH] Disable nullable warnings + +--- + Directory.Build.props | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 1057387..f029e23 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -107,9 +107,9 @@ + + + +- +- $(NoWarn);CA1416 ++ $(NoWarn);CA1416;CS8600;CS8618;CS8766 + true + + $(WarningsNotAsErrors);CS1591 +-- +1.8.3.1 + From 8853017b3ab9e592bf406f3ba5f20542d90044af Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 2 Apr 2021 17:31:42 +0000 Subject: [PATCH 17/36] .NET 5 vstest patch --- patches/vstest/0008-build-for-.NET-5.patch | 123 +++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 patches/vstest/0008-build-for-.NET-5.patch diff --git a/patches/vstest/0008-build-for-.NET-5.patch b/patches/vstest/0008-build-for-.NET-5.patch new file mode 100644 index 0000000000..7d25ae512b --- /dev/null +++ b/patches/vstest/0008-build-for-.NET-5.patch @@ -0,0 +1,123 @@ +From e6f8be2661fa4684dd658eaf7b62f734fe85aa10 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Fri, 2 Apr 2021 17:11:31 +0000 +Subject: [PATCH] build for .NET 5 + +--- + scripts/build/TestPlatform.targets | 2 ++ + src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj | 2 +- + .../Microsoft.TestPlatform.CommunicationUtilities.csproj | 2 +- + .../Microsoft.TestPlatform.CoreUtilities.csproj | 2 +- + src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs | 2 +- + .../Microsoft.TestPlatform.CrossPlatEngine.csproj | 2 +- + .../Microsoft.TestPlatform.ObjectModel.csproj | 2 +- + .../Microsoft.TestPlatform.Utilities.csproj | 2 +- + 8 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/scripts/build/TestPlatform.targets b/scripts/build/TestPlatform.targets +index 6a3e102..44ebc82 100644 +--- a/scripts/build/TestPlatform.targets ++++ b/scripts/build/TestPlatform.targets +@@ -2,6 +2,8 @@ + + + $(MSBuildThisFileDirectory)..\..\ ++ ++ $(NoWarn);CA1416 + + + +diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj +index 3b73444..d99d47f 100644 +--- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj ++++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj +@@ -7,7 +7,7 @@ + + Microsoft.VisualStudio.TestPlatform.Common + netstandard2.0;netstandard1.3;net451 +- netstandard2.0;netstandard1.3 ++ netstandard2.0;net5.0 + true + + +diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj +index 8419b36..0eb30c6 100644 +--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj ++++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj +@@ -6,7 +6,7 @@ + + Microsoft.TestPlatform.CommunicationUtilities + netstandard2.0;netstandard1.3;net451 +- netstandard2.0;netstandard1.3 ++ netstandard2.0;net5.0 + true + true + +diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj +index 9ab8e59..026ddde 100644 +--- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj ++++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj +@@ -8,7 +8,7 @@ + Microsoft.TestPlatform.CoreUtilities + netstandard2.0;netstandard1.3;net451;net45 + $(TargetFrameworks);uap10.0;netstandard1.0 +- netstandard2.0;netstandard1.3;netstandard1.0 ++ netstandard2.0;net5.0 + + + false +diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs +index fb226a5..59b4247 100644 +--- a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs ++++ b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs +@@ -50,7 +50,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel + + #endif + +-#if NETSTANDARD ++#if NETSTANDARD || NET + public static PlatformTraceLevel TraceLevel + { + get +diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj +index 72e7d1f..77a7a2d 100644 +--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj ++++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj +@@ -7,7 +7,7 @@ + + Microsoft.TestPlatform.CrossPlatEngine + netstandard2.0;netstandard1.3;net451 +- netstandard2.0;netstandard1.3 ++ netstandard2.0;net5.0 + true + + +diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj +index ac7507c..f341424 100644 +--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj ++++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj +@@ -8,7 +8,7 @@ + Microsoft.VisualStudio.TestPlatform.ObjectModel + net45;net451;netstandard2.0;netstandard1.3 + $(TargetFrameworks);uap10.0;netstandard1.0 +- netstandard2.0;netstandard1.3;netstandard1.0 ++ netstandard2.0;net5.0 + Microsoft.TestPlatform.ObjectModel + + +diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj +index 7d14164..9787273 100644 +--- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj ++++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj +@@ -7,7 +7,7 @@ + + Microsoft.TestPlatform.Utilities + netstandard2.0;netstandard1.3;net451 +- netstandard2.0;netstandard1.3 ++ netstandard2.0;net5.0 + + + +-- +1.8.3.1 + From d0d4f5febeb84157613e823a72cdbd886a87b96d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 2 Apr 2021 20:42:42 +0000 Subject: [PATCH 18/36] Fix spacing issue in fsharp patch --- .../0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch b/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch index 9d91758eab..e137e7aaaa 100644 --- a/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch +++ b/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch @@ -26,7 +26,7 @@ index e741ff854..4aa80d6ca 100755 /restore \ - /p:Configuration=$bootstrap_config + /p:Configuration=$bootstrap_config \ -+ /bl: proto-fslex-tools.binlog ++ /bl:proto-fslex-tools.binlog mkdir -p "$bootstrap_dir" - cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp3.1 $bootstrap_dir/fslex From a02c3e1fba704d2c7dfaceed72225d2a1f98cd0b Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sat, 3 Apr 2021 23:51:21 -0500 Subject: [PATCH 19/36] Update TFM patch to match MSBuild TFMs --- ....0-TFM-to-avoid-3.1-apphost-prebuilt.patch | 61 +++++++++++++++---- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch b/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch index e137e7aaaa..cbbf98180a 100644 --- a/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch +++ b/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch @@ -1,23 +1,25 @@ -From 2e75e18f01c08390adb1914c9fe40cce7c3f9ed4 Mon Sep 17 00:00:00 2001 +From e71f2b0325d269f63a2373ce63722f4f3046084e Mon Sep 17 00:00:00 2001 From: dseefeld Date: Wed, 24 Mar 2021 15:10:07 +0000 -Subject: [PATCH] Use net5.0 TFM to avoid 3.1 apphost prebuilt +Subject: [PATCH 5/5] Use net5.0 TFM to avoid 3.1 apphost prebuilt See https://github.com/dotnet/source-build/issues/1905 --- eng/build.sh | 11 +++--- - proto.proj | 4 +-- + proto.proj | 6 ++-- .../AssemblyCheck/AssemblyCheck.fsproj | 2 +- src/buildtools/fslex/fslex.fsproj | 2 +- src/buildtools/fsyacc/fsyacc.fsproj | 2 +- - .../Microsoft.FSharp.Compiler.csproj | 6 ++-- + src/fsharp/FSharp.Build/FSharp.Build.fsproj | 3 +- + .../Microsoft.FSharp.Compiler.csproj | 8 ++--- .../Microsoft.FSharp.Compiler.nuspec | 34 +++++++++---------- src/fsharp/fsc/fsc.fsproj | 1 + src/fsharp/fsi/fsi.fsproj | 3 +- - 9 files changed, 34 insertions(+), 31 deletions(-) + .../VisualFSharpFull/VisualFSharpFull.csproj | 2 +- + 11 files changed, 38 insertions(+), 36 deletions(-) diff --git a/eng/build.sh b/eng/build.sh -index e741ff854..4aa80d6ca 100755 +index e741ff854..165ba0b7f 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -244,20 +244,21 @@ function BuildSolution { @@ -48,11 +50,15 @@ index e741ff854..4aa80d6ca 100755 # do real build diff --git a/proto.proj b/proto.proj -index bb2f97270..bb0778345 100644 +index bb2f97270..6c344c880 100644 --- a/proto.proj +++ b/proto.proj -@@ -10,10 +10,10 @@ - TargetFramework=netstandard2.0 +@@ -7,13 +7,13 @@ + + + +- TargetFramework=netstandard2.0 ++ TargetFramework=netcoreapp2.1 - TargetFramework=netcoreapp3.1 @@ -103,8 +109,22 @@ index a2b8cb384..5d1b7141f 100644 INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) true +diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj +index 3d36804a7..5a9e49bb0 100644 +--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj ++++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj +@@ -4,8 +4,7 @@ + + + Library +- netstandard2.0 +- netstandard2.0 ++ netcoreapp2.1;netcoreapp3.1 + FSharp.Build + $(NoWarn);45;55;62;75;1204 + true diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj -index e75296aa7..26620118b 100644 +index e75296aa7..d162af011 100644 --- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj +++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj @@ -2,7 +2,7 @@ @@ -116,7 +136,7 @@ index e75296aa7..26620118b 100644 Microsoft.FSharp.Compiler.nuspec true .NET Core compatible version of the F# compiler fsc.exe. -@@ -11,10 +11,10 @@ +@@ -11,13 +11,13 @@ @@ -128,6 +148,10 @@ index e75296aa7..26620118b 100644 + TargetFramework=net5.0 +- TargetFramework=netstandard2.0 ++ TargetFramework=netcoreapp2.1 + + TargetFramework=netstandard2.0 diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec index f5cac7b09..933b63b1f 100644 @@ -229,6 +253,19 @@ index 0f1a28f15..5422267a4 100644 +diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj +index be3261418..7afea0af3 100644 +--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj ++++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj +@@ -42,7 +42,7 @@ + All + 2 + True +- TargetFramework=$(DependencyTargetFramework) ++ TargetFramework=netcoreapp2.1 + + + {649FA588-F02E-457C-9FCF-87E46407481E} -- -2.25.4 +2.18.0 From 1530b5f783abf88f075643780669b8f5b231545a Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sun, 4 Apr 2021 12:29:14 -0500 Subject: [PATCH 20/36] Some SDK patches to workaround small issues. --- ...r-using-both-quiet-and-verbose-that-.patch | 42 +++++++++++++++++++ .../0022-Don-t-think-we-need-this-file.patch | 25 +++++++++++ ...0023-Easy-workaround-for-NuGet-error.patch | 29 +++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 patches/sdk/0021-Disable-check-for-using-both-quiet-and-verbose-that-.patch create mode 100644 patches/sdk/0022-Don-t-think-we-need-this-file.patch create mode 100644 patches/sdk/0023-Easy-workaround-for-NuGet-error.patch diff --git a/patches/sdk/0021-Disable-check-for-using-both-quiet-and-verbose-that-.patch b/patches/sdk/0021-Disable-check-for-using-both-quiet-and-verbose-that-.patch new file mode 100644 index 0000000000..f0e935a52a --- /dev/null +++ b/patches/sdk/0021-Disable-check-for-using-both-quiet-and-verbose-that-.patch @@ -0,0 +1,42 @@ +From 83171b82c8db3adafd862a7ab480f3c148975831 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Sun, 4 Apr 2021 00:08:36 -0500 +Subject: [PATCH 21/21] Disable check for using both quiet and verbose that + uses a function we don't have. + +--- + src/BuiltInTools/dotnet-watch/Program.cs | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/BuiltInTools/dotnet-watch/Program.cs b/src/BuiltInTools/dotnet-watch/Program.cs +index 5d0d4c732..2a434243b 100644 +--- a/src/BuiltInTools/dotnet-watch/Program.cs ++++ b/src/BuiltInTools/dotnet-watch/Program.cs +@@ -110,15 +110,15 @@ internal static RootCommand CreateRootCommand(Func + new[] { "--verbose", "-v" }, + "Show verbose output"); + +- verbose.AddValidator(v => +- { +- if (v.FindResultFor(quiet) is not null && v.FindResultFor(verbose) is not null) +- { +- return Resources.Error_QuietAndVerboseSpecified; +- } +- +- return null; +- }); ++// verbose.AddValidator(v => ++// { ++// if (v.FindResultFor(quiet) is not null && v.FindResultFor(verbose) is not null) ++// { ++// return Resources.Error_QuietAndVerboseSpecified; ++// } ++// ++// return null; ++// }); + + var root = new RootCommand(Description) + { +-- +2.18.0 + diff --git a/patches/sdk/0022-Don-t-think-we-need-this-file.patch b/patches/sdk/0022-Don-t-think-we-need-this-file.patch new file mode 100644 index 0000000000..1122bdfead --- /dev/null +++ b/patches/sdk/0022-Don-t-think-we-need-this-file.patch @@ -0,0 +1,25 @@ +From fd2790ad703ab10eb4f82fc8e5d4565b83333753 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Sun, 4 Apr 2021 02:36:35 -0500 +Subject: [PATCH 22/22] Don't think we need this file. + +--- + src/Layout/redist/targets/OverlaySdkOnLKG.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets +index ab94ba45b..3dc19ea2c 100644 +--- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets ++++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets +@@ -14,7 +14,7 @@ + + + +- ++ + + +-- +2.18.0 + diff --git a/patches/sdk/0023-Easy-workaround-for-NuGet-error.patch b/patches/sdk/0023-Easy-workaround-for-NuGet-error.patch new file mode 100644 index 0000000000..2bb87b597a --- /dev/null +++ b/patches/sdk/0023-Easy-workaround-for-NuGet-error.patch @@ -0,0 +1,29 @@ +From bbea3466a1201b31e0712c8fbe25353ec91ad64d Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Sun, 4 Apr 2021 09:40:06 -0500 +Subject: [PATCH 23/23] Easy workaround for NuGet error. + +--- + .../OverrideAndCreateBundledNETCoreAppPackageVersion.cs | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs b/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs +index c3175a3c1..826e4fc36 100644 +--- a/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs ++++ b/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs +@@ -118,9 +118,10 @@ void CheckAndReplaceAttribute(XAttribute attribute) + /// + private static bool IsSDKServicing(string sdkVersion) + { +- var parsedSdkVersion = NuGet.Versioning.NuGetVersion.Parse(sdkVersion); ++ // var parsedSdkVersion = NuGet.Versioning.NuGetVersion.Parse(sdkVersion); + +- return parsedSdkVersion.Patch % 100 != 0; ++ // return parsedSdkVersion.Patch % 100 != 0; ++ return true; + } + } + } +-- +2.18.0 + From f26e6c791a39c76d0b28b8c0334b2d540a0077c3 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 5 Apr 2021 10:09:36 -0500 Subject: [PATCH 21/36] Fix building web templates in ASP.NET. --- .../arcade/0006-Add-task-for-ASP.NET.patch | 209 ++++++++++++++++++ .../0020-Try-to-get-templates-to-build.patch | 75 +++++++ 2 files changed, 284 insertions(+) create mode 100644 patches/arcade/0006-Add-task-for-ASP.NET.patch create mode 100644 patches/aspnetcore/0020-Try-to-get-templates-to-build.patch diff --git a/patches/arcade/0006-Add-task-for-ASP.NET.patch b/patches/arcade/0006-Add-task-for-ASP.NET.patch new file mode 100644 index 0000000000..cbeff8ec2c --- /dev/null +++ b/patches/arcade/0006-Add-task-for-ASP.NET.patch @@ -0,0 +1,209 @@ +From 399b294e6ebd3797513a22ab2213d5be512a162f Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Sun, 4 Apr 2021 20:04:41 -0500 +Subject: [PATCH 6/6] Add task for ASP.NET. + +--- + .../src/GenerateFileFromTemplate.cs | 190 ++++++++++++++++++ + 1 file changed, 190 insertions(+) + create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/src/GenerateFileFromTemplate.cs + +diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateFileFromTemplate.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateFileFromTemplate.cs +new file mode 100644 +index 00000000..ef98d8fc +--- /dev/null ++++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateFileFromTemplate.cs +@@ -0,0 +1,190 @@ ++// Copyright (c) .NET Foundation. All rights reserved. ++// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. ++ ++using System; ++using System.Collections.Generic; ++using System.IO; ++using System.Text; ++using Microsoft.Build.Framework; ++using Microsoft.Build.Utilities; ++ ++namespace Microsoft.AspNetCore.BuildTools ++{ ++ /// ++ /// ++ /// Generates a new file at . ++ /// ++ /// ++ /// The can define variables for substitution using . ++ /// ++ /// ++ /// The input file might look like this: ++ /// ++ /// 2 + 2 = ${Sum} ++ /// ++ /// When the task is invoked like this, it will produce "2 + 2 = 4" ++ /// ++ /// <GenerateFileFromTemplate Properties="Sum=4;OtherValue=123;" ... > ++ /// ++ /// ++ /// ++ public class GenerateFileFromTemplate : Task ++ { ++ /// ++ /// The template file. ++ /// Variable syntax: ${VarName} ++ /// If your template file needs to output this format, you can escape the dollar sign with a backtick, e.g. `${NotReplaced} ++ /// ++ [Required] ++ public string TemplateFile { get; set; } ++ ++ /// ++ /// The destination for the generated file. ++ /// ++ [Required] ++ [Output] ++ public string OutputPath { get; set; } ++ ++ /// ++ /// Key=value pairs of values ++ /// ++ [Required] ++ public string[] Properties { get; set; } ++ ++ public override bool Execute() ++ { ++ var outputPath = Path.GetFullPath(OutputPath.Replace('\\', '/')); ++ ++ if (!File.Exists(TemplateFile)) ++ { ++ Log.LogError($"File {TemplateFile} does not exist"); ++ return false; ++ } ++ ++ var values = MSBuildListSplitter.GetNamedProperties(Properties); ++ var template = File.ReadAllText(TemplateFile); ++ ++ var result = Replace(template, values); ++ Directory.CreateDirectory(Path.GetDirectoryName(outputPath)); ++ File.WriteAllText(outputPath, result); ++ ++ return true; ++ } ++ ++ public string Replace(string template, IDictionary values) ++ { ++ var sb = new StringBuilder(); ++ var varNameSb = new StringBuilder(); ++ var line = 1; ++ for (var i = 0; i < template.Length; i++) ++ { ++ var ch = template[i]; ++ var nextCh = i + 1 >= template.Length ++ ? '\0' ++ : template[i + 1]; ++ ++ // count lines in the template file ++ if (ch == '\n') ++ { ++ line++; ++ } ++ ++ if (ch == '`' && (nextCh == '$' || nextCh == '`')) ++ { ++ // skip the backtick for known escape characters ++ i++; ++ sb.Append(nextCh); ++ continue; ++ } ++ ++ if (ch != '$' || nextCh != '{') ++ { ++ // variables begin with ${. Moving on. ++ sb.Append(ch); ++ continue; ++ } ++ ++ varNameSb.Clear(); ++ i += 2; ++ for (; i < template.Length; i++) ++ { ++ ch = template[i]; ++ if (ch != '}') ++ { ++ varNameSb.Append(ch); ++ } ++ else ++ { ++ // Found the end of the variable substitution ++ var varName = varNameSb.ToString(); ++ if (values.TryGetValue(varName, out var value)) ++ { ++ sb.Append(value); ++ } ++ else ++ { ++ Log.LogWarning(null, null, null, TemplateFile, ++ line, 0, 0, 0, ++ message: $"No property value is available for '{varName}'"); ++ } ++ ++ varNameSb.Clear(); ++ break; ++ } ++ } ++ ++ if (varNameSb.Length > 0) ++ { ++ Log.LogWarning(null, null, null, TemplateFile, ++ line, 0, 0, 0, ++ message: "Expected closing bracket for variable placeholder. No substitution will be made."); ++ sb.Append("${").Append(varNameSb.ToString()); ++ } ++ } ++ ++ return sb.ToString(); ++ } ++ } ++ ++ internal static class MSBuildListSplitter ++ { ++ public static IDictionary GetNamedProperties(string input) ++ { ++ if (string.IsNullOrEmpty(input)) ++ { ++ return new Dictionary(StringComparer.OrdinalIgnoreCase); ++ } ++ ++ return GetNamedProperties(input.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)); ++ } ++ ++ public static IDictionary GetNamedProperties(string[] input) ++ { ++ var values = new Dictionary(StringComparer.OrdinalIgnoreCase); ++ if (input == null) ++ { ++ return values; ++ } ++ ++ foreach (var item in input) ++ { ++ var splitIdx = item.IndexOf('='); ++ if (splitIdx < 0) ++ { ++ continue; ++ } ++ ++ var key = item.Substring(0, splitIdx).Trim(); ++ if (string.IsNullOrEmpty(key)) ++ { ++ continue; ++ } ++ ++ var value = item.Substring(splitIdx + 1); ++ values[key] = value; ++ } ++ ++ return values; ++ } ++ } ++} +-- +2.18.0 + diff --git a/patches/aspnetcore/0020-Try-to-get-templates-to-build.patch b/patches/aspnetcore/0020-Try-to-get-templates-to-build.patch new file mode 100644 index 0000000000..0b2ae33648 --- /dev/null +++ b/patches/aspnetcore/0020-Try-to-get-templates-to-build.patch @@ -0,0 +1,75 @@ +From 42a4cb1b80128e87e014d91bbb349a8057e308e7 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Sun, 4 Apr 2021 17:38:54 -0500 +Subject: [PATCH 20/20] Try to get templates to build + +--- + src/ProjectTemplates/GenerateContent.targets | 2 ++ + .../Microsoft.DotNet.Web.Client.ItemTemplates.csproj | 1 + + .../Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj | 1 + + .../Microsoft.DotNet.Web.ProjectTemplates.csproj | 1 + + .../Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj | 1 + + 5 files changed, 6 insertions(+) + +diff --git a/src/ProjectTemplates/GenerateContent.targets b/src/ProjectTemplates/GenerateContent.targets +index 0de73148b3..c748e69512 100644 +--- a/src/ProjectTemplates/GenerateContent.targets ++++ b/src/ProjectTemplates/GenerateContent.targets +@@ -1,4 +1,6 @@ + ++ ++ + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + +diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj b/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj +index 38c7fb6b62..55867f6524 100644 +--- a/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj ++++ b/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj +@@ -3,6 +3,7 @@ + + $(DefaultNetCoreTargetFramework) + Web Client-Side File Templates for Microsoft Template Engine ++ false + + + +diff --git a/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj b/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj +index 20e88246ec..74305ab084 100644 +--- a/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj ++++ b/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj +@@ -3,6 +3,7 @@ + + $(DefaultNetCoreTargetFramework) + Web File Templates for Microsoft Template Engine. ++ false + + + +diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +index 5b39b0fd0d..ad935040a2 100644 +--- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj ++++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +@@ -5,6 +5,7 @@ + Microsoft.DotNet.Web.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) + ASP.NET Core Web Template Pack for Microsoft Template Engine + $(RepoRoot)src\Components\WebAssembly\ ++ false + + + +diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj +index 62e1c07e7d..1d5f276ae0 100644 +--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj ++++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj +@@ -7,6 +7,7 @@ + $(PackageTags);spa + + true ++ false + + + +-- +2.18.0 + From 20650be7908122f5472b18ada6db4a1631f36b44 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Mon, 5 Apr 2021 09:34:24 -0500 Subject: [PATCH 22/36] Update from BAR Build ID 84775 - NuGet.Client fix --- NuGet.config | 11 ++++++----- build.sh | 10 ++++++++-- eng/Version.Details.xml | 18 +++++++++--------- smoke-testNuGet.Config | 18 ++++++++++++++++++ 4 files changed, 41 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index addf00421b..9090bb8682 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,15 @@ + + + + + + @@ -18,10 +24,5 @@ - - - - - diff --git a/build.sh b/build.sh index d86185e5f0..f3ad7599b3 100755 --- a/build.sh +++ b/build.sh @@ -109,9 +109,15 @@ if [ "${internalPackageFeedPat:-}" ]; then # The internal transport isn't added by Darc, though, so it will still need special-casing. export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [ {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-ce71b27b/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-5/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, - {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, - {"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"} + {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"} ]}' fi diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6c5de9eb4..97f26ebf43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,14 +58,14 @@ https://github.com/dotnet/roslyn-analyzers ce71b27be743710012c0460071da188b2f05959c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - fad4343fa8ba919bb8a1b86bb22310824bf14268 + + https://github.com/nuget/nuget.client + d525b0e670f3b6cbd5c73a35f04730a9f658c852 nuget-client - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 461a94d08054f1b683ef2855c18acf9de0e1175c + 51369266643769f9f0c1184e89715cd1045126d0 sdk @@ -92,13 +92,13 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - 6a858a323caa439115e9e3cf1c958b04f4ff9993 + 99b911a57a02fc5d2eeef23e9ab8cbea4505678b - + https://dev.azure.com/dnceng/internal/_git/dotnet-installer - 3346fa974fffdbb431685520cce0ff793568499a + db7cc87d512335808e3806067f2bf9b31379e1db installer diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config index 6e19935217..4cb433465d 100644 --- a/smoke-testNuGet.Config +++ b/smoke-testNuGet.Config @@ -2,6 +2,24 @@ + + + + + + + + + + + + + + + + + + From 91ff5f99637bdc6a2f570b3062edc91e576bec32 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Mon, 5 Apr 2021 11:37:59 -0500 Subject: [PATCH 23/36] Unpdate nuget.client source directory --- repos/nuget-client.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/nuget-client.proj b/repos/nuget-client.proj index 3b2addf0cb..3262630389 100644 --- a/repos/nuget-client.proj +++ b/repos/nuget-client.proj @@ -1,7 +1,7 @@ - NuGet-NuGet.Client-Trusted + nuget.client From b233ae4ecbfc8648910ee9f30b74b5c59c61a320 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Mon, 5 Apr 2021 12:47:58 -0500 Subject: [PATCH 24/36] Add back internal-transport feed --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f3ad7599b3..e84a095c29 100755 --- a/build.sh +++ b/build.sh @@ -117,7 +117,8 @@ if [ "${internalPackageFeedPat:-}" ]; then {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, - {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"} + {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, + {"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"} ]}' fi From 12ffb0035498d3ae212d52a9a9dee363ea504933 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 5 Apr 2021 14:02:51 -0500 Subject: [PATCH 25/36] Upgrade command-line-api --- eng/Version.Details.xml | 4 +- ...ude-dotnet-suggest-from-source-build.patch | 81 ++++++------- ...ion-properties-for-reference-version.patch | 29 ++--- ...-to-netcoreapp3.1-to-avoid-prebuilts.patch | 43 ++++--- ...4-Exclude-System.CommandLine.Hosting.patch | 10 +- ...Remove-custom-nullability-attributes.patch | 111 ++++++++++++++++++ ...r-using-both-quiet-and-verbose-that-.patch | 42 ------- 7 files changed, 191 insertions(+), 129 deletions(-) create mode 100644 patches/command-line-api/0005-Remove-custom-nullability-attributes.patch delete mode 100644 patches/sdk/0021-Disable-check-for-using-both-quiet-and-verbose-that-.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97f26ebf43..32be732f09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ 956e14dedd3a3ac981b320d66c6d389387a2954a - + https://github.com/dotnet/command-line-api - afd010ba8cb3cbd714c734465d1a5de1ee133e2d + 6ddde11ed45e3f4b9d80c97670f347dbfda15c3f https://github.com/dotnet/roslyn diff --git a/patches/command-line-api/0001-Exclude-dotnet-suggest-from-source-build.patch b/patches/command-line-api/0001-Exclude-dotnet-suggest-from-source-build.patch index 8955b368ed..07a17c8ad4 100644 --- a/patches/command-line-api/0001-Exclude-dotnet-suggest-from-source-build.patch +++ b/patches/command-line-api/0001-Exclude-dotnet-suggest-from-source-build.patch @@ -1,20 +1,20 @@ -From aafb58d2919b4ebe663cd61fd7fc622358da2ce5 Mon Sep 17 00:00:00 2001 +From f6976aaccc195fb298e1c61d20d5b75ea5ac52f5 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 18 Sep 2020 16:09:49 -0500 -Subject: [PATCH 1/3] Exclude dotnet-suggest from source-build. +Subject: [PATCH 1/4] Exclude dotnet-suggest from source-build. This is not used by any downstream repos in source-build and adds a bunch of prebuilts, so we can leave this out for now. --- - System.CommandLine.sln | 134 ------------------ + System.CommandLine.sln | 105 ------------------ .../dotnet-suggest.csproj | 1 + - 2 files changed, 1 insertion(+), 134 deletions(-) + 2 files changed, 1 insertion(+), 105 deletions(-) diff --git a/System.CommandLine.sln b/System.CommandLine.sln -index ec97010..102aefe 100644 +index bb83d4f..7caad0e 100644 --- a/System.CommandLine.sln +++ b/System.CommandLine.sln -@@ -30,31 +30,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E5B1EC71-0FC +@@ -30,32 +30,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E5B1EC71-0FC EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine", "src\System.CommandLine\System.CommandLine.csproj", "{0BE8E56E-7580-4526-BE24-D304E1779724}" EndProject @@ -28,12 +28,12 @@ index ec97010..102aefe 100644 EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.DragonFruit.Tests", "src\System.CommandLine.DragonFruit.Tests\System.CommandLine.DragonFruit.Tests.csproj", "{1F4B2074-F651-4A02-A860-7DDA74B2CC5F}" -EndProject --Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-suggest", "src\System.CommandLine.Suggest\dotnet-suggest.csproj", "{E23C760E-B826-4B4F-BE76-916D86BAD2DB}" --EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-suggest", "src\System.CommandLine.Suggest\dotnet-suggest.csproj", "{E23C760E-B826-4B4F-BE76-916D86BAD2DB}" + EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-suggest.Tests", "src\System.CommandLine.Suggest.Tests\dotnet-suggest.Tests.csproj", "{E41F0471-B14D-4FA0-9D8B-1E7750695AE9}" -EndProject --Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenderingPlayground", "samples\RenderingPlayground\RenderingPlayground.csproj", "{8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}" --EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenderingPlayground", "samples\RenderingPlayground\RenderingPlayground.csproj", "{8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}" + EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Rendering", "src\System.CommandLine.Rendering\System.CommandLine.Rendering.csproj", "{27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Rendering.Tests", "src\System.CommandLine.Rendering.Tests\System.CommandLine.Rendering.Tests.csproj", "{9E574595-A9CD-441A-9328-1D4DD5B531E8}" @@ -43,10 +43,11 @@ index ec97010..102aefe 100644 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Hosting", "src\System.CommandLine.Hosting\System.CommandLine.Hosting.csproj", "{644C4B4A-4A32-4307-9F71-C3BF901FFB66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CommandLine.Hosting.Tests", "src\System.CommandLine.Hosting.Tests\System.CommandLine.Hosting.Tests.csproj", "{39483140-BC26-4CAD-BBAE-3DC76C2F16CF}" +-EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostingPlayground", "samples\HostingPlayground\HostingPlayground.csproj", "{0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -@@ -78,30 +61,6 @@ Global +@@ -80,30 +66,6 @@ Global {0BE8E56E-7580-4526-BE24-D304E1779724}.Release|x64.Build.0 = Release|Any CPU {0BE8E56E-7580-4526-BE24-D304E1779724}.Release|x86.ActiveCfg = Release|Any CPU {0BE8E56E-7580-4526-BE24-D304E1779724}.Release|x86.Build.0 = Release|Any CPU @@ -77,7 +78,7 @@ index ec97010..102aefe 100644 {EEC30462-078F-45EB-AA70-12E3170CD51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EEC30462-078F-45EB-AA70-12E3170CD51E}.Debug|Any CPU.Build.0 = Debug|Any CPU {EEC30462-078F-45EB-AA70-12E3170CD51E}.Debug|x64.ActiveCfg = Debug|Any CPU -@@ -114,54 +73,6 @@ Global +@@ -116,18 +78,6 @@ Global {EEC30462-078F-45EB-AA70-12E3170CD51E}.Release|x64.Build.0 = Release|Any CPU {EEC30462-078F-45EB-AA70-12E3170CD51E}.Release|x86.ActiveCfg = Release|Any CPU {EEC30462-078F-45EB-AA70-12E3170CD51E}.Release|x86.Build.0 = Release|Any CPU @@ -93,18 +94,13 @@ index ec97010..102aefe 100644 - {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|x64.Build.0 = Release|Any CPU - {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|x86.ActiveCfg = Release|Any CPU - {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|x86.Build.0 = Release|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x64.ActiveCfg = Debug|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x64.Build.0 = Debug|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x86.ActiveCfg = Debug|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x86.Build.0 = Debug|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|Any CPU.ActiveCfg = Release|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|Any CPU.Build.0 = Release|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x64.ActiveCfg = Release|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x64.Build.0 = Release|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x86.ActiveCfg = Release|Any CPU -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x86.Build.0 = Release|Any CPU + {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x64.ActiveCfg = Debug|Any CPU +@@ -140,18 +90,6 @@ Global + {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x64.Build.0 = Release|Any CPU + {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x86.ActiveCfg = Release|Any CPU + {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x86.Build.0 = Release|Any CPU - {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -117,22 +113,10 @@ index ec97010..102aefe 100644 - {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|x64.Build.0 = Release|Any CPU - {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|x86.ActiveCfg = Release|Any CPU - {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|x86.Build.0 = Release|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|Any CPU.Build.0 = Debug|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x64.ActiveCfg = Debug|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x64.Build.0 = Debug|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x86.ActiveCfg = Debug|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x86.Build.0 = Debug|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|Any CPU.ActiveCfg = Release|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|Any CPU.Build.0 = Release|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|x64.ActiveCfg = Release|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|x64.Build.0 = Release|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|x86.ActiveCfg = Release|Any CPU -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Release|x86.Build.0 = Release|Any CPU - {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Debug|x64.ActiveCfg = Debug|Any CPU -@@ -174,30 +85,6 @@ Global + {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x64.ActiveCfg = Debug|Any CPU +@@ -176,30 +114,6 @@ Global {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Release|x64.Build.0 = Release|Any CPU {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Release|x86.ActiveCfg = Release|Any CPU {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Release|x86.Build.0 = Release|Any CPU @@ -163,7 +147,7 @@ index ec97010..102aefe 100644 {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Debug|Any CPU.Build.0 = Debug|Any CPU {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Debug|x64.ActiveCfg = Debug|Any CPU -@@ -210,36 +97,15 @@ Global +@@ -212,18 +126,6 @@ Global {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Release|x64.Build.0 = Release|Any CPU {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Release|x86.ActiveCfg = Release|Any CPU {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Release|x86.Build.0 = Release|Any CPU @@ -179,9 +163,10 @@ index ec97010..102aefe 100644 - {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|x64.Build.0 = Release|Any CPU - {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|x86.ActiveCfg = Release|Any CPU - {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + {0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}.Debug|x64.ActiveCfg = Debug|Any CPU +@@ -242,18 +144,11 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {0BE8E56E-7580-4526-BE24-D304E1779724} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} @@ -189,17 +174,17 @@ index ec97010..102aefe 100644 - {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00} = {6749FB3E-39DE-4321-A39E-525278E9408D} {EEC30462-078F-45EB-AA70-12E3170CD51E} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} - {1F4B2074-F651-4A02-A860-7DDA74B2CC5F} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} -- {E23C760E-B826-4B4F-BE76-916D86BAD2DB} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} + {E23C760E-B826-4B4F-BE76-916D86BAD2DB} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} - {E41F0471-B14D-4FA0-9D8B-1E7750695AE9} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} -- {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E} = {6749FB3E-39DE-4321-A39E-525278E9408D} + {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E} = {6749FB3E-39DE-4321-A39E-525278E9408D} {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} - {9E574595-A9CD-441A-9328-1D4DD5B531E8} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} - {C39B0705-993E-43DB-B66A-A37A587F0BF7} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} {644C4B4A-4A32-4307-9F71-C3BF901FFB66} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} - {39483140-BC26-4CAD-BBAE-3DC76C2F16CF} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} + {0BF6958D-9EE3-4623-B3D6-4DA77EAC1906} = {6749FB3E-39DE-4321-A39E-525278E9408D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {5C159F93-800B-49E7-9905-EE09F8B8434A} diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj index f529484..ef9c3bb 100644 --- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj diff --git a/patches/command-line-api/0002-Use-package-version-properties-for-reference-version.patch b/patches/command-line-api/0002-Use-package-version-properties-for-reference-version.patch index 4a19441d40..3eba8804d2 100644 --- a/patches/command-line-api/0002-Use-package-version-properties-for-reference-version.patch +++ b/patches/command-line-api/0002-Use-package-version-properties-for-reference-version.patch @@ -1,18 +1,18 @@ -From 74c9b072853ff4d68f2630462a6f1ac5d576979d Mon Sep 17 00:00:00 2001 +From 4860e6a90c1f0b014a79d9a4c5c237d53281902d Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 21 Sep 2020 09:59:02 -0500 -Subject: [PATCH 2/2] Use package version properties for reference versions. +Subject: [PATCH 2/4] Use package version properties for reference versions. --- - eng/Versions.props | 7 +++++-- - src/System.CommandLine/System.CommandLine.csproj | 4 ++-- - 2 files changed, 7 insertions(+), 4 deletions(-) + eng/Versions.props | 8 ++++++-- + src/System.CommandLine/System.CommandLine.csproj | 4 ++-- + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props -index 3048701..16a0eb7 100644 +index 3048701..6e9c9af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -29,9 +29,12 @@ +@@ -29,9 +29,13 @@ true true @@ -26,22 +26,23 @@ index 3048701..16a0eb7 100644 + 4.4.1 + 4.5.3 + ++ diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj -index 1ae8dd3..aaa2c4a 100644 +index 5841d89..83d604c 100644 --- a/src/System.CommandLine/System.CommandLine.csproj +++ b/src/System.CommandLine/System.CommandLine.csproj -@@ -19,8 +19,8 @@ - - +@@ -24,8 +24,8 @@ + + - -- +- + + - + --- +-- 2.18.0 diff --git a/patches/command-line-api/0003-Update-to-netcoreapp3.1-to-avoid-prebuilts.patch b/patches/command-line-api/0003-Update-to-netcoreapp3.1-to-avoid-prebuilts.patch index 1e2f712719..9a386670f2 100644 --- a/patches/command-line-api/0003-Update-to-netcoreapp3.1-to-avoid-prebuilts.patch +++ b/patches/command-line-api/0003-Update-to-netcoreapp3.1-to-avoid-prebuilts.patch @@ -1,22 +1,22 @@ -From b9a21ec1c0a77ef4e1e44840a0526545fea456de Mon Sep 17 00:00:00 2001 +From 6ba61ef1825bab057b0715792c8a67be02538a2f Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 29 Oct 2020 01:48:54 -0500 -Subject: [PATCH] Update to netcoreapp3.1 to avoid prebuilts +Subject: [PATCH 3/4] Update to netcoreapp3.1 to avoid prebuilts netcoreapp3.1 avoids prebuilts (Microsoft.CSharp) but works with the rest of source-build: runtime and roslyn. Includes a code fix for ref nullability with the new framework. --- - .../System.CommandLine.DragonFruit.csproj | 2 +- + .../System.CommandLine.DragonFruit.csproj | 4 ++-- .../System.CommandLine.Hosting.csproj | 2 +- .../System.CommandLine.Rendering.csproj | 2 +- src/System.CommandLine/Binding/BindingContext.cs | 2 +- src/System.CommandLine/System.CommandLine.csproj | 7 +------ - 5 files changed, 5 insertions(+), 10 deletions(-) + 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/System.CommandLine.DragonFruit/System.CommandLine.DragonFruit.csproj b/src/System.CommandLine.DragonFruit/System.CommandLine.DragonFruit.csproj -index b3a542fd..06167997 100644 +index b3a542f..284f90e 100644 --- a/src/System.CommandLine.DragonFruit/System.CommandLine.DragonFruit.csproj +++ b/src/System.CommandLine.DragonFruit/System.CommandLine.DragonFruit.csproj @@ -1,7 +1,7 @@ @@ -28,21 +28,28 @@ index b3a542fd..06167997 100644 This package includes the experimental DragonFruit app model for System.CommandLine, which allows you to create a command line application using only a Main method while getting support for complex type binding, error reporting, help, shell completions, and more. +@@ -11,4 +11,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj b/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj -index 1d00cff2..7342c1c5 100644 +index c6cb6ff..de0b5b9 100644 --- a/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj +++ b/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj @@ -2,7 +2,7 @@ true -- netstandard2.0 -+ netcoreapp3.1 +- netstandard2.0;netstandard2.1 ++ netcoreapp3.1 latest This package provides support for using System.CommandLine with Microsoft.Extensions.Hosting. diff --git a/src/System.CommandLine.Rendering/System.CommandLine.Rendering.csproj b/src/System.CommandLine.Rendering/System.CommandLine.Rendering.csproj -index d552286e..84026ebe 100644 +index 54b32a6..4283b8c 100644 --- a/src/System.CommandLine.Rendering/System.CommandLine.Rendering.csproj +++ b/src/System.CommandLine.Rendering/System.CommandLine.Rendering.csproj @@ -2,7 +2,7 @@ @@ -51,14 +58,14 @@ index d552286e..84026ebe 100644 true - netstandard2.0 + netcoreapp3.1 - 7.3 + 8 This package provides support for structured command line output rendering. Write code once that renders correctly in multiple output modes, including System.Console, virtual terminal (using ANSI escape sequences), and plain text. diff --git a/src/System.CommandLine/Binding/BindingContext.cs b/src/System.CommandLine/Binding/BindingContext.cs -index b942ba6a..bbb83891 100644 +index 7104958..4d8776e 100644 --- a/src/System.CommandLine/Binding/BindingContext.cs +++ b/src/System.CommandLine/Binding/BindingContext.cs -@@ -55,7 +55,7 @@ namespace System.CommandLine.Binding +@@ -56,7 +56,7 @@ namespace System.CommandLine.Binding public ModelBinder GetModelBinder(IValueDescriptor valueDescriptor) { @@ -68,7 +75,7 @@ index b942ba6a..bbb83891 100644 return binder; } diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj -index aaa2c4a3..5e875a73 100644 +index 83d604c..675c6d7 100644 --- a/src/System.CommandLine/System.CommandLine.csproj +++ b/src/System.CommandLine/System.CommandLine.csproj @@ -3,7 +3,7 @@ @@ -78,11 +85,11 @@ index aaa2c4a3..5e875a73 100644 - netstandard2.0 + netcoreapp3.1 8 + enable This package includes a powerful command line parser and other tools for building command line applications, including: - -@@ -18,9 +18,4 @@ - portable - +@@ -23,9 +23,4 @@ + + - - @@ -91,5 +98,5 @@ index aaa2c4a3..5e875a73 100644 - -- -2.25.2 +2.18.0 diff --git a/patches/command-line-api/0004-Exclude-System.CommandLine.Hosting.patch b/patches/command-line-api/0004-Exclude-System.CommandLine.Hosting.patch index 849b410d81..b104d8bb36 100644 --- a/patches/command-line-api/0004-Exclude-System.CommandLine.Hosting.patch +++ b/patches/command-line-api/0004-Exclude-System.CommandLine.Hosting.patch @@ -1,7 +1,7 @@ -From f4053c72fd35e1ec0b238cb5f27f818b837a3632 Mon Sep 17 00:00:00 2001 +From 58d888bf2d32219d4b1f89e3462b589223c1be48 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 5 Nov 2020 10:48:59 -0600 -Subject: [PATCH] Exclude System.CommandLine.Hosting +Subject: [PATCH 4/4] Exclude System.CommandLine.Hosting This project is not used by downstream repos and restores prebuilts. --- @@ -9,11 +9,11 @@ This project is not used by downstream repos and restores prebuilts. 1 file changed, 1 insertion(+) diff --git a/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj b/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj -index 7342c1c..e4a97a0 100644 +index de0b5b9..b899a45 100644 --- a/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj +++ b/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj @@ -5,6 +5,7 @@ - netcoreapp3.1 + netcoreapp3.1 latest This package provides support for using System.CommandLine with Microsoft.Extensions.Hosting. + true @@ -21,5 +21,5 @@ index 7342c1c..e4a97a0 100644 -- -2.25.2 +2.18.0 diff --git a/patches/command-line-api/0005-Remove-custom-nullability-attributes.patch b/patches/command-line-api/0005-Remove-custom-nullability-attributes.patch new file mode 100644 index 0000000000..59efa3dff9 --- /dev/null +++ b/patches/command-line-api/0005-Remove-custom-nullability-attributes.patch @@ -0,0 +1,111 @@ +From 8ae354c62554774a9561001eeb3e80ca01e96d09 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Mon, 5 Apr 2021 12:44:35 -0500 +Subject: [PATCH 5/5] Remove custom nullability attributes + +--- + .../System.CommandLine.csproj | 5 +- + src/System.Diagnostics.CodeAnalysis.cs | 70 ------------------- + 2 files changed, 1 insertion(+), 74 deletions(-) + delete mode 100644 src/System.Diagnostics.CodeAnalysis.cs + +diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj +index 675c6d7..54ee05d 100644 +--- a/src/System.CommandLine/System.CommandLine.csproj ++++ b/src/System.CommandLine/System.CommandLine.csproj +@@ -13,14 +13,11 @@ + * Constructor- and property-based model binding for complex types + * Test and debug support + ++ nullable + + + + portable + +- +- +- +- + + +diff --git a/src/System.Diagnostics.CodeAnalysis.cs b/src/System.Diagnostics.CodeAnalysis.cs +deleted file mode 100644 +index 8df0ee9..0000000 +--- a/src/System.Diagnostics.CodeAnalysis.cs ++++ /dev/null +@@ -1,70 +0,0 @@ +-// Licensed to the .NET Foundation under one or more agreements. +-// The .NET Foundation licenses this file to you under the MIT license. +-// See the LICENSE file in the project root for more information. +- +-#pragma warning disable CA1801, CA1822 +- +-namespace System.Diagnostics.CodeAnalysis +-{ +- [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)] +- internal sealed class AllowNullAttribute : Attribute +- { +- } +- +- [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)] +- internal sealed class DisallowNullAttribute : Attribute +- { +- } +- +- [AttributeUsage(AttributeTargets.Method, Inherited = false)] +- internal sealed class DoesNotReturnAttribute : Attribute +- { +- } +- +- [AttributeUsage(AttributeTargets.Parameter)] +- internal sealed class DoesNotReturnIfAttribute : Attribute +- { +- public DoesNotReturnIfAttribute(bool parameterValue) { } +- +- public bool ParameterValue { get { throw null!; } } +- } +- +- [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Struct, Inherited = false, AllowMultiple = false)] +- internal sealed class ExcludeFromCodeCoverageAttribute : Attribute +- { +- } +- +- [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)] +- internal sealed class MaybeNullAttribute : Attribute +- { +- } +- +- [AttributeUsage(AttributeTargets.Parameter)] +- internal sealed class MaybeNullWhenAttribute : Attribute +- { +- public MaybeNullWhenAttribute(bool returnValue) { } +- +- public bool ReturnValue { get { throw null!; } } +- } +- +- [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)] +- internal sealed class NotNullAttribute : Attribute +- { +- } +- +- [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)] +- internal sealed class NotNullIfNotNullAttribute : Attribute +- { +- public NotNullIfNotNullAttribute(string parameterName) { } +- +- public string ParameterName { get { throw null!; } } +- } +- +- [AttributeUsage(AttributeTargets.Parameter)] +- internal sealed class NotNullWhenAttribute : Attribute +- { +- public NotNullWhenAttribute(bool returnValue) { } +- +- public bool ReturnValue { get { throw null!; } } +- } +-} +\ No newline at end of file +-- +2.18.0 + diff --git a/patches/sdk/0021-Disable-check-for-using-both-quiet-and-verbose-that-.patch b/patches/sdk/0021-Disable-check-for-using-both-quiet-and-verbose-that-.patch deleted file mode 100644 index f0e935a52a..0000000000 --- a/patches/sdk/0021-Disable-check-for-using-both-quiet-and-verbose-that-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 83171b82c8db3adafd862a7ab480f3c148975831 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Sun, 4 Apr 2021 00:08:36 -0500 -Subject: [PATCH 21/21] Disable check for using both quiet and verbose that - uses a function we don't have. - ---- - src/BuiltInTools/dotnet-watch/Program.cs | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/BuiltInTools/dotnet-watch/Program.cs b/src/BuiltInTools/dotnet-watch/Program.cs -index 5d0d4c732..2a434243b 100644 ---- a/src/BuiltInTools/dotnet-watch/Program.cs -+++ b/src/BuiltInTools/dotnet-watch/Program.cs -@@ -110,15 +110,15 @@ internal static RootCommand CreateRootCommand(Func - new[] { "--verbose", "-v" }, - "Show verbose output"); - -- verbose.AddValidator(v => -- { -- if (v.FindResultFor(quiet) is not null && v.FindResultFor(verbose) is not null) -- { -- return Resources.Error_QuietAndVerboseSpecified; -- } -- -- return null; -- }); -+// verbose.AddValidator(v => -+// { -+// if (v.FindResultFor(quiet) is not null && v.FindResultFor(verbose) is not null) -+// { -+// return Resources.Error_QuietAndVerboseSpecified; -+// } -+// -+// return null; -+// }); - - var root = new RootCommand(Description) - { --- -2.18.0 - From af107d2c2da909ad84c7c9c679f8390441aa345f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 5 Apr 2021 19:57:24 +0000 Subject: [PATCH 26/36] Add command-line-api solution filter --- ...ude-dotnet-suggest-from-source-build.patch | 178 +----------------- .../0006-Add-slnf-file-for-source-build.patch | 29 +++ repos/command-line-api.proj | 1 + 3 files changed, 31 insertions(+), 177 deletions(-) create mode 100644 patches/command-line-api/0006-Add-slnf-file-for-source-build.patch diff --git a/patches/command-line-api/0001-Exclude-dotnet-suggest-from-source-build.patch b/patches/command-line-api/0001-Exclude-dotnet-suggest-from-source-build.patch index 07a17c8ad4..b5529410a0 100644 --- a/patches/command-line-api/0001-Exclude-dotnet-suggest-from-source-build.patch +++ b/patches/command-line-api/0001-Exclude-dotnet-suggest-from-source-build.patch @@ -6,185 +6,9 @@ Subject: [PATCH 1/4] Exclude dotnet-suggest from source-build. This is not used by any downstream repos in source-build and adds a bunch of prebuilts, so we can leave this out for now. --- - System.CommandLine.sln | 105 ------------------ .../dotnet-suggest.csproj | 1 + - 2 files changed, 1 insertion(+), 105 deletions(-) + 1 files changed, 1 insertion(+) -diff --git a/System.CommandLine.sln b/System.CommandLine.sln -index bb83d4f..7caad0e 100644 ---- a/System.CommandLine.sln -+++ b/System.CommandLine.sln -@@ -30,32 +30,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E5B1EC71-0FC - EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine", "src\System.CommandLine\System.CommandLine.csproj", "{0BE8E56E-7580-4526-BE24-D304E1779724}" - EndProject --Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Tests", "src\System.CommandLine.Tests\System.CommandLine.Tests.csproj", "{F843CCCA-4CC9-422C-A881-3AE6A998B53F}" --EndProject - Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{6749FB3E-39DE-4321-A39E-525278E9408D}" - EndProject --Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragonFruit", "samples\DragonFruit\DragonFruit.csproj", "{8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}" --EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.DragonFruit", "src\System.CommandLine.DragonFruit\System.CommandLine.DragonFruit.csproj", "{EEC30462-078F-45EB-AA70-12E3170CD51E}" - EndProject --Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.DragonFruit.Tests", "src\System.CommandLine.DragonFruit.Tests\System.CommandLine.DragonFruit.Tests.csproj", "{1F4B2074-F651-4A02-A860-7DDA74B2CC5F}" --EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-suggest", "src\System.CommandLine.Suggest\dotnet-suggest.csproj", "{E23C760E-B826-4B4F-BE76-916D86BAD2DB}" - EndProject --Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-suggest.Tests", "src\System.CommandLine.Suggest.Tests\dotnet-suggest.Tests.csproj", "{E41F0471-B14D-4FA0-9D8B-1E7750695AE9}" --EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenderingPlayground", "samples\RenderingPlayground\RenderingPlayground.csproj", "{8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}" - EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Rendering", "src\System.CommandLine.Rendering\System.CommandLine.Rendering.csproj", "{27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}" - EndProject --Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Rendering.Tests", "src\System.CommandLine.Rendering.Tests\System.CommandLine.Rendering.Tests.csproj", "{9E574595-A9CD-441A-9328-1D4DD5B531E8}" --EndProject --Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Benchmarks", "src\System.CommandLine.Benchmarks\System.CommandLine.Benchmarks.csproj", "{C39B0705-993E-43DB-B66A-A37A587F0BF7}" --EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CommandLine.Hosting", "src\System.CommandLine.Hosting\System.CommandLine.Hosting.csproj", "{644C4B4A-4A32-4307-9F71-C3BF901FFB66}" - EndProject --Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.CommandLine.Hosting.Tests", "src\System.CommandLine.Hosting.Tests\System.CommandLine.Hosting.Tests.csproj", "{39483140-BC26-4CAD-BBAE-3DC76C2F16CF}" --EndProject - Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HostingPlayground", "samples\HostingPlayground\HostingPlayground.csproj", "{0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}" - EndProject - Global -@@ -80,30 +66,6 @@ Global - {0BE8E56E-7580-4526-BE24-D304E1779724}.Release|x64.Build.0 = Release|Any CPU - {0BE8E56E-7580-4526-BE24-D304E1779724}.Release|x86.ActiveCfg = Release|Any CPU - {0BE8E56E-7580-4526-BE24-D304E1779724}.Release|x86.Build.0 = Release|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Debug|Any CPU.Build.0 = Debug|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Debug|x64.ActiveCfg = Debug|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Debug|x64.Build.0 = Debug|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Debug|x86.ActiveCfg = Debug|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Debug|x86.Build.0 = Debug|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Release|Any CPU.ActiveCfg = Release|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Release|Any CPU.Build.0 = Release|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Release|x64.ActiveCfg = Release|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Release|x64.Build.0 = Release|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Release|x86.ActiveCfg = Release|Any CPU -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F}.Release|x86.Build.0 = Release|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Debug|Any CPU.Build.0 = Debug|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Debug|x64.ActiveCfg = Debug|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Debug|x64.Build.0 = Debug|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Debug|x86.ActiveCfg = Debug|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Debug|x86.Build.0 = Debug|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Release|Any CPU.ActiveCfg = Release|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Release|Any CPU.Build.0 = Release|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Release|x64.ActiveCfg = Release|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Release|x64.Build.0 = Release|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Release|x86.ActiveCfg = Release|Any CPU -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00}.Release|x86.Build.0 = Release|Any CPU - {EEC30462-078F-45EB-AA70-12E3170CD51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEC30462-078F-45EB-AA70-12E3170CD51E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEC30462-078F-45EB-AA70-12E3170CD51E}.Debug|x64.ActiveCfg = Debug|Any CPU -@@ -116,18 +78,6 @@ Global - {EEC30462-078F-45EB-AA70-12E3170CD51E}.Release|x64.Build.0 = Release|Any CPU - {EEC30462-078F-45EB-AA70-12E3170CD51E}.Release|x86.ActiveCfg = Release|Any CPU - {EEC30462-078F-45EB-AA70-12E3170CD51E}.Release|x86.Build.0 = Release|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Debug|Any CPU.Build.0 = Debug|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Debug|x64.ActiveCfg = Debug|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Debug|x64.Build.0 = Debug|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Debug|x86.ActiveCfg = Debug|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Debug|x86.Build.0 = Debug|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|Any CPU.ActiveCfg = Release|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|Any CPU.Build.0 = Release|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|x64.ActiveCfg = Release|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|x64.Build.0 = Release|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|x86.ActiveCfg = Release|Any CPU -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F}.Release|x86.Build.0 = Release|Any CPU - {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Debug|x64.ActiveCfg = Debug|Any CPU -@@ -140,18 +90,6 @@ Global - {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x64.Build.0 = Release|Any CPU - {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x86.ActiveCfg = Release|Any CPU - {E23C760E-B826-4B4F-BE76-916D86BAD2DB}.Release|x86.Build.0 = Release|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|Any CPU.Build.0 = Debug|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|x64.ActiveCfg = Debug|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|x64.Build.0 = Debug|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|x86.ActiveCfg = Debug|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Debug|x86.Build.0 = Debug|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|Any CPU.ActiveCfg = Release|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|Any CPU.Build.0 = Release|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|x64.ActiveCfg = Release|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|x64.Build.0 = Release|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|x86.ActiveCfg = Release|Any CPU -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9}.Release|x86.Build.0 = Release|Any CPU - {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E}.Debug|x64.ActiveCfg = Debug|Any CPU -@@ -176,30 +114,6 @@ Global - {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Release|x64.Build.0 = Release|Any CPU - {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Release|x86.ActiveCfg = Release|Any CPU - {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E}.Release|x86.Build.0 = Release|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Debug|Any CPU.Build.0 = Debug|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Debug|x64.ActiveCfg = Debug|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Debug|x64.Build.0 = Debug|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Debug|x86.ActiveCfg = Debug|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Debug|x86.Build.0 = Debug|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Release|Any CPU.ActiveCfg = Release|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Release|Any CPU.Build.0 = Release|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Release|x64.ActiveCfg = Release|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Release|x64.Build.0 = Release|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Release|x86.ActiveCfg = Release|Any CPU -- {9E574595-A9CD-441A-9328-1D4DD5B531E8}.Release|x86.Build.0 = Release|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Debug|Any CPU.Build.0 = Debug|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Debug|x64.ActiveCfg = Debug|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Debug|x64.Build.0 = Debug|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Debug|x86.ActiveCfg = Debug|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Debug|x86.Build.0 = Debug|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Release|Any CPU.ActiveCfg = Release|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Release|Any CPU.Build.0 = Release|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Release|x64.ActiveCfg = Release|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Release|x64.Build.0 = Release|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Release|x86.ActiveCfg = Release|Any CPU -- {C39B0705-993E-43DB-B66A-A37A587F0BF7}.Release|x86.Build.0 = Release|Any CPU - {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Debug|x64.ActiveCfg = Debug|Any CPU -@@ -212,18 +126,6 @@ Global - {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Release|x64.Build.0 = Release|Any CPU - {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Release|x86.ActiveCfg = Release|Any CPU - {644C4B4A-4A32-4307-9F71-C3BF901FFB66}.Release|x86.Build.0 = Release|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Debug|Any CPU.Build.0 = Debug|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Debug|x64.ActiveCfg = Debug|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Debug|x64.Build.0 = Debug|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Debug|x86.ActiveCfg = Debug|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Debug|x86.Build.0 = Debug|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|Any CPU.ActiveCfg = Release|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|Any CPU.Build.0 = Release|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|x64.ActiveCfg = Release|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|x64.Build.0 = Release|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|x86.ActiveCfg = Release|Any CPU -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF}.Release|x86.Build.0 = Release|Any CPU - {0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BF6958D-9EE3-4623-B3D6-4DA77EAC1906}.Debug|x64.ActiveCfg = Debug|Any CPU -@@ -242,18 +144,11 @@ Global - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {0BE8E56E-7580-4526-BE24-D304E1779724} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} -- {F843CCCA-4CC9-422C-A881-3AE6A998B53F} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} -- {8A592CB0-5FB9-4E70-A68A-BE5B5BE23C00} = {6749FB3E-39DE-4321-A39E-525278E9408D} - {EEC30462-078F-45EB-AA70-12E3170CD51E} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} -- {1F4B2074-F651-4A02-A860-7DDA74B2CC5F} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} - {E23C760E-B826-4B4F-BE76-916D86BAD2DB} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} -- {E41F0471-B14D-4FA0-9D8B-1E7750695AE9} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} - {8D9A8DCB-DC74-4B3A-B1C6-046C9C4F458E} = {6749FB3E-39DE-4321-A39E-525278E9408D} - {27E3BFFC-4412-4E4C-A656-B9D35B8A0F3E} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} -- {9E574595-A9CD-441A-9328-1D4DD5B531E8} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} -- {C39B0705-993E-43DB-B66A-A37A587F0BF7} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} - {644C4B4A-4A32-4307-9F71-C3BF901FFB66} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} -- {39483140-BC26-4CAD-BBAE-3DC76C2F16CF} = {E5B1EC71-0FC4-4FAA-9C65-32D5016FBC45} - {0BF6958D-9EE3-4623-B3D6-4DA77EAC1906} = {6749FB3E-39DE-4321-A39E-525278E9408D} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj index f529484..ef9c3bb 100644 --- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj diff --git a/patches/command-line-api/0006-Add-slnf-file-for-source-build.patch b/patches/command-line-api/0006-Add-slnf-file-for-source-build.patch new file mode 100644 index 0000000000..c0866d3f5e --- /dev/null +++ b/patches/command-line-api/0006-Add-slnf-file-for-source-build.patch @@ -0,0 +1,29 @@ +From 04b80f151a5cdbec7cbdfcdf6b5645cfe68d8ff6 Mon Sep 17 00:00:00 2001 +From: msimons +Date: Wed, 24 Mar 2021 19:48:46 +0000 +Subject: [PATCH] Add slnf file for source-build + +--- + source-build.slnf | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + create mode 100644 source-build.slnf + +diff --git a/source-build.slnf b/source-build.slnf +new file mode 100644 +index 000000000..845a61e86 +--- /dev/null ++++ b/source-build.slnf +@@ -0,0 +1,11 @@ ++{ ++ "solution": { ++ "path": "System.CommandLine.sln", ++ "projects": [ ++ "src\\System.CommandLine.DragonFruit\\System.CommandLine.DragonFruit.csproj", ++ "src\\System.CommandLine.Hosting\\System.CommandLine.Hosting.csproj", ++ "src\\System.CommandLine.Rendering\\System.CommandLine.Rendering.csproj", ++ "src\\System.CommandLine\\System.CommandLine.csproj" ++ ] ++ } ++} +-- +2.25.4 diff --git a/repos/command-line-api.proj b/repos/command-line-api.proj index 2951834f17..57e458792b 100644 --- a/repos/command-line-api.proj +++ b/repos/command-line-api.proj @@ -8,6 +8,7 @@ $(BuildCommandArgs) --binaryLog $(BuildCommandArgs) -ci $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) + $(BuildCommandArgs) /p:Projects=$(ProjectDirectory)source-build.slnf $(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs) $(ProjectDirectory)global.json From 43ec8362352f4d6bc4e499390bf12e1f1b74483f Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Tue, 6 Apr 2021 10:14:40 -0500 Subject: [PATCH 27/36] Add aspnetcore internal feed --- NuGet.config | 1 + build.sh | 1 + smoke-testNuGet.Config | 1 + 3 files changed, 3 insertions(+) diff --git a/NuGet.config b/NuGet.config index 9090bb8682..ad2ef2e72a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,7 @@ + diff --git a/build.sh b/build.sh index e84a095c29..40af60df72 100755 --- a/build.sh +++ b/build.sh @@ -108,6 +108,7 @@ if [ "${internalPackageFeedPat:-}" ]; then # TODO: Read these from nuget.config # The internal transport isn't added by Darc, though, so it will still need special-casing. export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [ + {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-b7a2ec8c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-ce71b27b/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-5/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}, diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config index 4cb433465d..176ff5aa37 100644 --- a/smoke-testNuGet.Config +++ b/smoke-testNuGet.Config @@ -3,6 +3,7 @@ + From 45775c08d7deb1b1164cfe002822ac04dc762838 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Tue, 6 Apr 2021 10:20:59 -0500 Subject: [PATCH 28/36] Update online baseline --- tools-local/prebuilt-baseline-online.xml | 65 ++++++++++++------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index 5f4d5414bf..f7f1e81c9e 100755 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -4,34 +4,34 @@ artifacts/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ artifacts/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/ artifacts/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ - artifacts/src/dotnet-aspnetcore.e882394a7bb38930da748291fe2c2ceaa6a80588/ - artifacts/src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ - artifacts/src/command-line-api.afd010ba8cb3cbd714c734465d1a5de1ee133e2d/ + artifacts/src/dotnet-aspnetcore.b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb/ + artifacts/src/CliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ + artifacts/src/command-line-api.6ddde11ed45e3f4b9d80c97670f347dbfda15c3f/ artifacts/src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ artifacts/src/cssparser.d6d86bcd8c162b1ae22ef00955ff748d028dd0ee/ artifacts/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/ - artifacts/src/fsharp.da6be68280c89131cdba2045525b80890401defd/ + artifacts/src/fsharp.7ce7132f1459095e635194d09d6f73265352029a/ artifacts/src/Humanizer.b30550eed103a6970d8465fe7c5c16300b70be81/ - artifacts/src/dotnet-installer.ca6b6acadbd30de2160ab6a003fba072b2c7b568/ + artifacts/src/dotnet-installer.db7cc87d512335808e3806067f2bf9b31379e1db/ artifacts/src/known-good-tests./ artifacts/src/known-good./ - artifacts/src/linker.e0b9157b540f5fc020b2e7967f4bbd23ba826e4e/ - artifacts/src/msbuild.39993bd9d02917993b6147a9973dc3aa6e9b00c7/ + artifacts/src/linker.c43f981eec336c1dc4fd0ead84b5e09db9377d9e/ + artifacts/src/msbuild.5e4b48a27efce55a613664b58d353ab4c8d1f6c1/ src/netcorecli-fsc/ artifacts/src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/ artifacts/src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/ - artifacts/src/NuGet.Client.830c8be45dbbccd411ecf6080abff0c2c98079cf/ + artifacts/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/ src/package-source-build/ - artifacts/src/roslyn-analyzers.77b259353aa44ec1510951a75c6e7ed6e662a001/ - artifacts/src/roslyn.9ed4b774d20940880de8df1ca8b07508aa01c8cd/ - artifacts/src/dotnet-runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1/ - artifacts/src/dotnet-runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1/ - artifacts/src/dotnet-sdk.2932b586ae1ebf28415df80e0bf96d8015f2c192/ + artifacts/src/roslyn-analyzers.ce71b27be743710012c0460071da188b2f05959c/ + artifacts/src/roslyn.59eedc33d35754759994155ea2f4e1012a9951e3/ + artifacts/src/dotnet-runtime.2f740adc1457e8a28c1c072993b66f515977eb51/ + artifacts/src/dotnet-runtime.2f740adc1457e8a28c1c072993b66f515977eb51/ + artifacts/src/dotnet-sdk.51369266643769f9f0c1184e89715cd1045126d0/ artifacts/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/ artifacts/src/symreader.f8a3ba85aed339fb8d08ca26f3876b28c32d58ee/ - artifacts/src/templating.8dc4f8a9283d45103e132026797af30ead2aad6d/ + artifacts/src/templating.8470ff317250d761c72f920b8ea1c0700b230eb3/ artifacts/src/test-templates.956e14dedd3a3ac981b320d66c6d389387a2954a/ - artifacts/src/vstest.212656d7b384a506aa714999f678b3ace82d114e/ + artifacts/src/vstest.99b911a57a02fc5d2eeef23e9ab8cbea4505678b/ artifacts/src/xliff-tasks.a52f3d7fb58470749ee4035fbbcb7e63c78b0459/ Tools/ tools-local/tasks/ @@ -45,7 +45,6 @@ - @@ -54,7 +53,6 @@ - @@ -75,35 +73,36 @@ + - - + + + + - + - + - - - + + - - - + + - - + + @@ -241,6 +240,7 @@ + @@ -288,6 +288,7 @@ + @@ -331,7 +332,7 @@ - + @@ -392,6 +393,7 @@ + @@ -410,10 +412,9 @@ - + - From e9af177a0cd05cc69d8f821d92377b398db2e394 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 6 Apr 2021 18:36:20 +0000 Subject: [PATCH 29/36] Eliminate roslyn prebuilts within SDK --- ...ns.props-entries-for-Microsoft.CodeA.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 patches/sdk/0024-Patch-Add-Versions.props-entries-for-Microsoft.CodeA.patch diff --git a/patches/sdk/0024-Patch-Add-Versions.props-entries-for-Microsoft.CodeA.patch b/patches/sdk/0024-Patch-Add-Versions.props-entries-for-Microsoft.CodeA.patch new file mode 100644 index 0000000000..ccf227440d --- /dev/null +++ b/patches/sdk/0024-Patch-Add-Versions.props-entries-for-Microsoft.CodeA.patch @@ -0,0 +1,43 @@ +From 70f10ec5176d270ff24c76a04ed00785c0c38662 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Tue, 6 Apr 2021 18:31:54 +0000 +Subject: [PATCH] [Patch] Add Versions.props entries for Microsoft.CodeAnalysis + versions + +--- + eng/Versions.props | 2 ++ + src/Layout/redist/redist.csproj | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 4a1e9cf..162988f 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -81,7 +81,9 @@ + + + ++ 3.8.0-5.20519.18 + 5.0.2 ++ 3.8.0-5.20519.18 + + + +diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj +index bb3ebad..ea525eb 100644 +--- a/src/Layout/redist/redist.csproj ++++ b/src/Layout/redist/redist.csproj +@@ -31,8 +31,8 @@ + + + +- +- ++ ++ + + + +-- +1.8.3.1 + From 5096be9cd12a93a024ef281ab6b36a5a9f4caa89 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Tue, 6 Apr 2021 13:41:46 -0500 Subject: [PATCH 30/36] Update nuget.client src directory path --- repos/Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/Directory.Build.targets b/repos/Directory.Build.targets index f7e49abb63..bac58ebc60 100644 --- a/repos/Directory.Build.targets +++ b/repos/Directory.Build.targets @@ -581,8 +581,8 @@ - - + + Date: Tue, 6 Apr 2021 15:43:23 -0500 Subject: [PATCH 31/36] Use source-built version of System.ComponentModel.Composition --- .../0008-Use-source-built-Microsoft.Web.Xdt.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/patches/nuget-client/0008-Use-source-built-Microsoft.Web.Xdt.patch b/patches/nuget-client/0008-Use-source-built-Microsoft.Web.Xdt.patch index f48d787e18..815cee29f0 100644 --- a/patches/nuget-client/0008-Use-source-built-Microsoft.Web.Xdt.patch +++ b/patches/nuget-client/0008-Use-source-built-Microsoft.Web.Xdt.patch @@ -1,35 +1,37 @@ From ce18ce78f27717cb1079270d6a58d5c36e70425a Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 10 Dec 2020 16:17:55 -0600 -Subject: [PATCH] Use source-built Microsoft.Web.Xdt +Subject: [PATCH] Use source-built Microsoft.Web.Xdt & System.ComponentModel.Composition --- - build/packages.targets | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + build/packages.targets | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletion(-) diff --git a/build/packages.targets b/build/packages.targets index 19df3657c..7d8c01f84 100644 --- a/build/packages.targets +++ b/build/packages.targets -@@ -8,6 +8,10 @@ +@@ -8,6 +8,11 @@ 5.0.0 + + 3.0.0 ++ 4.5.0 + + 2.4.1 -@@ -52,7 +56,7 @@ +@@ -52,7 +57,7 @@ - + - +- ++ @@ -181,7 +181,7 @@ index f5cac7b09..933b63b1f 100644 + + + -+ ++ + target="lib\net5.0" /> @@ -194,12 +194,17 @@ index f5cac7b09..933b63b1f 100644 - +- +- +- +- +- + - - - -@@ -68,15 +68,15 @@ - ++ ++ ++ ++ ++ - @@ -211,7 +216,7 @@ index f5cac7b09..933b63b1f 100644 - target="lib\netcoreapp3.1" /> - + target="lib\net5.0" /> -+ ++ + target="lib\net5.0" /> From 3a0d4cabfbee0f74d0b7134a408e251707ea6602 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Wed, 7 Apr 2021 08:49:34 -0500 Subject: [PATCH 33/36] Add patch to locate FSharp.Core.xml --- .../0025-Update-F-path-to-use-net5.0.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 patches/sdk/0025-Update-F-path-to-use-net5.0.patch diff --git a/patches/sdk/0025-Update-F-path-to-use-net5.0.patch b/patches/sdk/0025-Update-F-path-to-use-net5.0.patch new file mode 100644 index 0000000000..c4c6638546 --- /dev/null +++ b/patches/sdk/0025-Update-F-path-to-use-net5.0.patch @@ -0,0 +1,28 @@ +From a73a286232bfe66a0c07fd13039c540e9d5257ba Mon Sep 17 00:00:00 2001 +From: Dan Seefeldt +Date: Wed, 7 Apr 2021 08:44:24 -0500 +Subject: [PATCH] Update F# path to use net5.0 + +Source-build builds F# with net5.0. This patch +updated SDK to look in the net5.0 path for an +XML file rather than netcoreapp3.1 +--- + src/Layout/tool_fsharp/tool_fsc.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj +index 14a8c7a68..1a665e87c 100644 +--- a/src/Layout/tool_fsharp/tool_fsc.csproj ++++ b/src/Layout/tool_fsharp/tool_fsc.csproj +@@ -14,7 +14,7 @@ + AfterTargets="_ResolveCopyLocalAssetsForPublish"> + + Date: Fri, 9 Apr 2021 16:41:38 +0000 Subject: [PATCH 34/36] Convert internal URIs to public --- eng/Version.Details.xml | 8 ++++---- repos/aspnetcore.proj | 2 +- repos/installer.proj | 2 +- repos/runtime.common.props | 2 +- repos/sdk.proj | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32be732f09..3132479294 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -28,7 +28,7 @@ linker - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + https://github.com/dotnet/runtime 2f740adc1457e8a28c1c072993b66f515977eb51 runtime runtime-portable @@ -64,7 +64,7 @@ nuget-client - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + https://github.com/dotnet/sdk 51369266643769f9f0c1184e89715cd1045126d0 sdk @@ -84,7 +84,7 @@ a52f3d7fb58470749ee4035fbbcb7e63c78b0459 - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + https://github.com/dotnet/aspnetcore b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb aspnetcore @@ -97,7 +97,7 @@ 99b911a57a02fc5d2eeef23e9ab8cbea4505678b - https://dev.azure.com/dnceng/internal/_git/dotnet-installer + https://github.com/dotnet/installer db7cc87d512335808e3806067f2bf9b31379e1db installer diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj index 9fbfee819a..50e459d144 100644 --- a/repos/aspnetcore.proj +++ b/repos/aspnetcore.proj @@ -1,6 +1,6 @@ - dotnet-aspnetcore + aspnetcore diff --git a/repos/installer.proj b/repos/installer.proj index 16b412218b..fd8a95be04 100644 --- a/repos/installer.proj +++ b/repos/installer.proj @@ -1,6 +1,6 @@ - dotnet-installer + installer diff --git a/repos/runtime.common.props b/repos/runtime.common.props index cb18f6b096..97ceb231ee 100644 --- a/repos/runtime.common.props +++ b/repos/runtime.common.props @@ -1,6 +1,6 @@ - dotnet-runtime + runtime diff --git a/repos/sdk.proj b/repos/sdk.proj index 6d9a4d1fd0..e07149dab4 100644 --- a/repos/sdk.proj +++ b/repos/sdk.proj @@ -1,6 +1,6 @@ - dotnet-sdk + sdk From c1c6e4dd754aed7aef018b8ebd21ec4653efe29d Mon Sep 17 00:00:00 2001 From: dseefeld Date: Fri, 9 Apr 2021 16:41:50 +0000 Subject: [PATCH 35/36] Remove internal feeds from nuget.config --- NuGet.config | 8 -------- smoke-testNuGet.Config | 8 -------- 2 files changed, 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad2ef2e72a..2e84c723e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,17 +2,9 @@ - - - - - - - - diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config index 176ff5aa37..07754412d4 100644 --- a/smoke-testNuGet.Config +++ b/smoke-testNuGet.Config @@ -2,17 +2,9 @@ - - - - - - - - From 8c371313f6dcbf1991795e759a71efc73ae6139e Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 13 Apr 2021 20:58:35 +0000 Subject: [PATCH 36/36] Don't warn on 3218 for buildtools in fsharp --- ...se-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch b/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch index 3b40f4444e..3744b73eb4 100644 --- a/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch +++ b/patches/fsharp/0006-Use-net5.0-TFM-to-avoid-3.1-apphost-prebuilt.patch @@ -8,15 +8,15 @@ See https://github.com/dotnet/source-build/issues/1905 eng/build.sh | 11 +++--- proto.proj | 6 ++-- .../AssemblyCheck/AssemblyCheck.fsproj | 2 +- - src/buildtools/fslex/fslex.fsproj | 2 +- - src/buildtools/fsyacc/fsyacc.fsproj | 2 +- + src/buildtools/fslex/fslex.fsproj | 3 ++- + src/buildtools/fsyacc/fsyacc.fsproj | 3 ++- src/fsharp/FSharp.Build/FSharp.Build.fsproj | 3 +- .../Microsoft.FSharp.Compiler.csproj | 8 ++--- .../Microsoft.FSharp.Compiler.nuspec | 34 +++++++++---------- src/fsharp/fsc/fsc.fsproj | 1 + src/fsharp/fsi/fsi.fsproj | 3 +- .../VisualFSharpFull/VisualFSharpFull.csproj | 2 +- - 11 files changed, 38 insertions(+), 36 deletions(-) + 11 files changed, 40 insertions(+), 36 deletions(-) diff --git a/eng/build.sh b/eng/build.sh index e741ff854..165ba0b7f 100755 @@ -87,12 +87,13 @@ diff --git a/src/buildtools/fslex/fslex.fsproj b/src/buildtools/fslex/fslex.fspr index da7c52ba1..1959ce59c 100644 --- a/src/buildtools/fslex/fslex.fsproj +++ b/src/buildtools/fslex/fslex.fsproj -@@ -2,7 +2,7 @@ +@@ -2,7 +2,8 @@ Exe - netcoreapp3.1 + net5.0 ++ $(OtherFlags) --nowarn:3218 INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) true @@ -100,12 +101,13 @@ diff --git a/src/buildtools/fsyacc/fsyacc.fsproj b/src/buildtools/fsyacc/fsyacc. index a2b8cb384..5d1b7141f 100644 --- a/src/buildtools/fsyacc/fsyacc.fsproj +++ b/src/buildtools/fsyacc/fsyacc.fsproj -@@ -2,7 +2,7 @@ +@@ -2,7 +2,8 @@ Exe - netcoreapp3.1 + net5.0 ++ $(OtherFlags) --nowarn:3218 INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants) true