From 0e36cfb4f3e550e494c89a27aaedaccedc1e0bef Mon Sep 17 00:00:00 2001 From: Phil Allen Date: Fri, 1 Mar 2024 12:59:38 -0800 Subject: [PATCH 1/5] Fix LibraryManager.sln so that it defaults to the vsix project --- LibraryManager.sln | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/LibraryManager.sln b/LibraryManager.sln index f6002a80..04502852 100644 --- a/LibraryManager.sln +++ b/LibraryManager.sln @@ -8,9 +8,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig .gitattributes = .gitattributes .gitignore = .gitignore - appveyor.yml = appveyor.yml CHANGELOG.md = CHANGELOG.md Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props LibraryManager.Settings.targets = LibraryManager.Settings.targets README.md = README.md version.json = version.json @@ -18,14 +18,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{A72570B1-99EF-4BDD-B629-321CD56C9F7F}" ProjectSection(SolutionItems) = preProject - src\Directory.Build.targets = src\Directory.Build.targets src\.globalconfig = src\.globalconfig + src\Directory.Build.targets = src\Directory.Build.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E67307E3-04FF-498B-97C7-4F508299DF4D}" ProjectSection(SolutionItems) = preProject + build\CreateInsertionMetadata.proj = build\CreateInsertionMetadata.proj build\PackageVersions.targets = build\PackageVersions.targets EndProjectSection EndProject @@ -34,14 +35,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManage {FF466454-426B-4AD7-8B00-D50011BE716F} = {FF466454-426B-4AD7-8B00-D50011BE716F} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Web.LibraryManager.Vsix", "src\LibraryManager.Vsix\Microsoft.Web.LibraryManager.Vsix.csproj", "{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Test", "test\LibraryManager.Test\Microsoft.Web.LibraryManager.Test.csproj", "{08C91CC3-4057-4D76-8B9A-B6A0557B64EB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Contracts", "src\LibraryManager.Contracts\Microsoft.Web.LibraryManager.Contracts.csproj", "{FF466454-426B-4AD7-8B00-D50011BE716F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Mocks", "test\LibraryManager.Mocks\Microsoft.Web.LibraryManager.Mocks.csproj", "{18F82568-446D-4729-B65E-EB9DF21C3636}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Web.LibraryManager.Vsix", "src\LibraryManager.Vsix\Microsoft.Web.LibraryManager.Vsix.csproj", "{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Build", "src\LibraryManager.Build\Microsoft.Web.LibraryManager.Build.csproj", "{7536DF26-B808-4AC2-A9DA-58E408A1E05B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Build.Test", "test\Microsoft.Web.LibraryManager.Build.Test\Microsoft.Web.LibraryManager.Build.Test.csproj", "{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}" From f1a0eb73cf67cfecfe4bc9a20737781e2992c85a Mon Sep 17 00:00:00 2001 From: Phil Allen Date: Thu, 7 Mar 2024 09:57:53 -0800 Subject: [PATCH 2/5] Various fixes to update the LibraryManager repo Extract TFMs that are likely to change into variables Update to net8 SourceLink is built into net8 SDK, can drop explciit references Update to net481, including source code references --- .gitignore | 3 ++- Directory.Build.props | 3 ++- Directory.Packages.props | 1 - Install-dotnet.ps1 | 4 ++-- build/CreateInsertionMetadata.proj | 4 ++-- global.json | 6 ++++++ .../Microsoft.Web.LibraryManager.Build.csproj | 15 ++++++++------- .../Microsoft.Web.LibraryManager.Build.props | 2 +- .../Microsoft.Web.LibraryManager.Build.targets | 2 +- src/LibraryManager.Build/RestoreTask.cs | 2 +- .../Microsoft.Web.LibraryManager.Contracts.csproj | 6 +++--- .../Microsoft.Web.LibraryManager.Vsix.csproj | 10 +++------- src/LibraryManager.Vsix/Shared/Telemetry.cs | 2 -- .../Microsoft.Web.LibraryManager.csproj | 4 ++-- src/libman/libman.csproj | 5 ++--- ...soft.Web.LibraryManager.IntegrationTest.csproj | 2 +- .../Microsoft.Web.LibraryManager.Mocks.csproj | 2 +- .../Configuration/SettingsTest.cs | 4 ++-- .../Microsoft.Web.LibraryManager.Test.csproj | 2 +- ...Microsoft.Web.LibraryManager.Build.Test.csproj | 4 ++-- .../Microsoft.Web.LibraryManager.Vsix.Test.csproj | 2 +- test/libman.Test/libman.Test.csproj | 5 +++-- 22 files changed, 46 insertions(+), 44 deletions(-) create mode 100644 global.json diff --git a/.gitignore b/.gitignore index 5db42414..7d132f05 100644 --- a/.gitignore +++ b/.gitignore @@ -197,6 +197,7 @@ ClientBin/ *.publishsettings node_modules/ orleans.codegen.cs +/.dotnet # Since there are multiple workflows, uncomment next line to ignore bower_components # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) @@ -269,4 +270,4 @@ __pycache__/ /src/libman/Properties/launchSettings.json # MSBuild binary log -*.binlog \ No newline at end of file +*.binlog diff --git a/Directory.Build.props b/Directory.Build.props index 36d057ed..0bbea41d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -19,6 +19,8 @@ $(RepoRoot)\artifacts\$(Configuration) true true + net481 + net8 @@ -27,7 +29,6 @@ - diff --git a/Directory.Packages.props b/Directory.Packages.props index 91fc71ad..14c41c6c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,7 +13,6 @@ - diff --git a/Install-dotnet.ps1 b/Install-dotnet.ps1 index 3a183961..f79bfab2 100644 --- a/Install-dotnet.ps1 +++ b/Install-dotnet.ps1 @@ -1,6 +1,6 @@ -$url="https://raw.githubusercontent.com/dotnet/cli/release/2.1.3xx/scripts/obtain/dotnet-install.ps1" +$url="https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" $output="$PSScriptRoot\dotnet-install.ps1" $installDir = Join-Path $PSScriptRoot ".dotnet" (New-Object System.Net.WebClient).DownloadFile($url, $output) -Invoke-Expression "& `"$output`" -InstallDir $installDir -Channel release/2.1.3xxx -Version 2.1.300" +Invoke-Expression "& `"$output`" -InstallDir $installDir -Channel 8.0.1xx -Quality ga" diff --git a/build/CreateInsertionMetadata.proj b/build/CreateInsertionMetadata.proj index c6f7d159..0afc0eca 100644 --- a/build/CreateInsertionMetadata.proj +++ b/build/CreateInsertionMetadata.proj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + $(NetCoreTFM) $(RepoRoot)\bin\InsertionParameters.txt diff --git a/global.json b/global.json new file mode 100644 index 00000000..b75deba6 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "8.0.100", + "rollForward": "latestPatch" + } +} diff --git a/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.csproj b/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.csproj index 683f42f5..dba5672d 100644 --- a/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.csproj +++ b/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net472 + netstandard2.0;$(NetFxTFM) True false library, package, client-side, build @@ -13,10 +13,11 @@ - - - - + + + + + @@ -35,6 +36,7 @@ + @@ -56,8 +58,7 @@ but before NuGet generates a nuspec. See https://github.com/NuGet/Home/issues/4704. --> - <_PackageFiles Include="$(OutputPath)\**\Microsoft.Web.LibraryManager*.dll;$(OutputPath)\**\Minimatch.dll;$(OutputPath)\**\Newtonsoft.Json.dll" - Exclude="$(OutputPath)\**\Microsoft.Web.LibraryManager.Build.dll"> + <_PackageFiles Include="$(OutputPath)\**\Microsoft.Web.LibraryManager*.dll;$(OutputPath)\**\Minimatch.dll;$(OutputPath)\**\Newtonsoft.Json.dll" Exclude="$(OutputPath)\**\Microsoft.Web.LibraryManager.Build.dll"> tools\%(RecursiveDir) false Content diff --git a/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.props b/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.props index 6f9dc2d9..05c54d69 100644 --- a/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.props +++ b/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.props @@ -3,7 +3,7 @@ <_ProviderAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netstandard2.0\Microsoft.Web.LibraryManager.dll - <_ProviderAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Web.LibraryManager.dll + <_ProviderAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\$(NetFxTFM)\Microsoft.Web.LibraryManager.dll $(_ProviderAssembly); diff --git a/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.targets b/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.targets index a8fd9da9..401fecd4 100644 --- a/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.targets +++ b/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.targets @@ -3,7 +3,7 @@ <_LibraryTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netstandard2.0\Microsoft.Web.LibraryManager.Build.dll - <_LibraryTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Web.LibraryManager.Build.dll + <_LibraryTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\$(NetFxTFM)\Microsoft.Web.LibraryManager.Build.dll diff --git a/src/LibraryManager.Build/RestoreTask.cs b/src/LibraryManager.Build/RestoreTask.cs index c8ecc713..11b99137 100644 --- a/src/LibraryManager.Build/RestoreTask.cs +++ b/src/LibraryManager.Build/RestoreTask.cs @@ -16,7 +16,7 @@ namespace Microsoft.Web.LibraryManager.Build { public class RestoreTask -#if NET472 +#if NET481 : AppDomainIsolatedTask #else : Task diff --git a/src/LibraryManager.Contracts/Microsoft.Web.LibraryManager.Contracts.csproj b/src/LibraryManager.Contracts/Microsoft.Web.LibraryManager.Contracts.csproj index 567f105a..602d53f7 100644 --- a/src/LibraryManager.Contracts/Microsoft.Web.LibraryManager.Contracts.csproj +++ b/src/LibraryManager.Contracts/Microsoft.Web.LibraryManager.Contracts.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net472 + netstandard2.0;$(NetFxTFM) library, package, client-side True true @@ -13,7 +13,7 @@ - + @@ -35,7 +35,7 @@ in the package from their $(OutputPath). --> + Condition="'$(TargetFramework)'=='$(NetFxTFM)'"> $(TargetDir)%(SatelliteDllsProjectOutputGroupOutput.TargetPath) diff --git a/src/LibraryManager.Vsix/Microsoft.Web.LibraryManager.Vsix.csproj b/src/LibraryManager.Vsix/Microsoft.Web.LibraryManager.Vsix.csproj index db631d92..c21dc0f6 100644 --- a/src/LibraryManager.Vsix/Microsoft.Web.LibraryManager.Vsix.csproj +++ b/src/LibraryManager.Vsix/Microsoft.Web.LibraryManager.Vsix.csproj @@ -14,7 +14,7 @@ $(BaseOutputPath)\$(Configuration) Microsoft.Web.LibraryManager.Vsix Microsoft.Web.LibraryManager.Vsix - v4.7.2 + v4.8.1 true Microsoft.Web.LibraryManager.vsix Extensions @@ -419,17 +419,13 @@ - - <_VsixSourceItemsFromNuGet Include="@(VSIXSourceItem)" - Condition="'%(VSIXSourceItem.NuGetSourceType)' == 'Package'"> + <_VsixSourceItemsFromNuGet Include="@(VSIXSourceItem)" Condition="'%(VSIXSourceItem.NuGetSourceType)' == 'Package'"> - + - diff --git a/src/LibraryManager.Vsix/Shared/Telemetry.cs b/src/LibraryManager.Vsix/Shared/Telemetry.cs index f331f085..686c131b 100644 --- a/src/LibraryManager.Vsix/Shared/Telemetry.cs +++ b/src/LibraryManager.Vsix/Shared/Telemetry.cs @@ -4,8 +4,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Security.Cryptography; -using System.Text; using Microsoft.VisualStudio.Telemetry; using Microsoft.Web.LibraryManager.Contracts; diff --git a/src/LibraryManager/Microsoft.Web.LibraryManager.csproj b/src/LibraryManager/Microsoft.Web.LibraryManager.csproj index 82ef1781..45b183c2 100644 --- a/src/LibraryManager/Microsoft.Web.LibraryManager.csproj +++ b/src/LibraryManager/Microsoft.Web.LibraryManager.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net472 + netstandard2.0;$(NetFxTFM) True library, package, client-side true @@ -43,7 +43,7 @@ in the package from their $(OutputPath). --> + Condition="'$(TargetFramework)'=='$(NetFxTFM)'"> $(TargetDir)%(SatelliteDllsProjectOutputGroupOutput.TargetPath) diff --git a/src/libman/libman.csproj b/src/libman/libman.csproj index 8560bc9e..26ba5f8b 100644 --- a/src/libman/libman.csproj +++ b/src/libman/libman.csproj @@ -2,16 +2,15 @@ Exe - netcoreapp2.1 + $(NetCoreTFM) Microsoft.Web.LibraryManager.Tools true - win-x64;win-x86;osx-x64 True Microsoft.Web.LibraryManager.Cli Command line tool for Library Manager - + diff --git a/test/LibraryManager.IntegrationTest/Microsoft.Web.LibraryManager.IntegrationTest.csproj b/test/LibraryManager.IntegrationTest/Microsoft.Web.LibraryManager.IntegrationTest.csproj index ab89de00..7dee9d5e 100644 --- a/test/LibraryManager.IntegrationTest/Microsoft.Web.LibraryManager.IntegrationTest.csproj +++ b/test/LibraryManager.IntegrationTest/Microsoft.Web.LibraryManager.IntegrationTest.csproj @@ -1,6 +1,6 @@  - net472 + $(NetFxTFM) $(NoWarn);MSB3270 diff --git a/test/LibraryManager.Mocks/Microsoft.Web.LibraryManager.Mocks.csproj b/test/LibraryManager.Mocks/Microsoft.Web.LibraryManager.Mocks.csproj index 929e44e5..84d26677 100644 --- a/test/LibraryManager.Mocks/Microsoft.Web.LibraryManager.Mocks.csproj +++ b/test/LibraryManager.Mocks/Microsoft.Web.LibraryManager.Mocks.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net472 + netstandard2.0;$(NetFxTFM) mocks, unit test, library, client-side, package True true diff --git a/test/LibraryManager.Test/Configuration/SettingsTest.cs b/test/LibraryManager.Test/Configuration/SettingsTest.cs index 64bf0b05..3f73f613 100644 --- a/test/LibraryManager.Test/Configuration/SettingsTest.cs +++ b/test/LibraryManager.Test/Configuration/SettingsTest.cs @@ -29,7 +29,7 @@ public TestSettings(string configFilePath) [ClassInitialize] public static void Setup(TestContext context) { -#if NET472 +#if NET481 TestFilePath = Path.Combine(context.DeploymentDirectory, "SettingsTest", "libman.config.json"); #else TestFilePath = Environment.ExpandEnvironmentVariables(@"%localappdata%\Microsoft\Library\libman.config.json"); @@ -40,7 +40,7 @@ public static void Setup(TestContext context) [ClassCleanup] public static void Cleanup() { -#if !NET472 +#if !NET481 // cleanup when we're leaving files behind not under the test DeploymentDirectory Directory.Delete(Path.GetDirectoryName(TestFilePath), true); #endif diff --git a/test/LibraryManager.Test/Microsoft.Web.LibraryManager.Test.csproj b/test/LibraryManager.Test/Microsoft.Web.LibraryManager.Test.csproj index 0d952cc2..40d162b2 100644 --- a/test/LibraryManager.Test/Microsoft.Web.LibraryManager.Test.csproj +++ b/test/LibraryManager.Test/Microsoft.Web.LibraryManager.Test.csproj @@ -1,6 +1,6 @@  - net6.0;net472 + $(NetCoreTFM);$(NetFxTFM) diff --git a/test/Microsoft.Web.LibraryManager.Build.Test/Microsoft.Web.LibraryManager.Build.Test.csproj b/test/Microsoft.Web.LibraryManager.Build.Test/Microsoft.Web.LibraryManager.Build.Test.csproj index 7f541826..55686afc 100644 --- a/test/Microsoft.Web.LibraryManager.Build.Test/Microsoft.Web.LibraryManager.Build.Test.csproj +++ b/test/Microsoft.Web.LibraryManager.Build.Test/Microsoft.Web.LibraryManager.Build.Test.csproj @@ -1,6 +1,6 @@  - net6.0;net472 + $(NetCoreTFM);$(NetFxTFM) @@ -9,7 +9,7 @@ - + diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/Microsoft.Web.LibraryManager.Vsix.Test.csproj b/test/Microsoft.Web.LibraryManager.Vsix.Test/Microsoft.Web.LibraryManager.Vsix.Test.csproj index 3280dd41..024e73a5 100644 --- a/test/Microsoft.Web.LibraryManager.Vsix.Test/Microsoft.Web.LibraryManager.Vsix.Test.csproj +++ b/test/Microsoft.Web.LibraryManager.Vsix.Test/Microsoft.Web.LibraryManager.Vsix.Test.csproj @@ -1,6 +1,6 @@  - net472 + $(NetFxTFM) true true diff --git a/test/libman.Test/libman.Test.csproj b/test/libman.Test/libman.Test.csproj index 62d24065..c3c49dca 100644 --- a/test/libman.Test/libman.Test.csproj +++ b/test/libman.Test/libman.Test.csproj @@ -1,6 +1,6 @@ - + - net6.0 + $(NetCoreTFM) Microsoft.Web.LibraryManager.Tools.Test @@ -12,6 +12,7 @@ + From 3f5981cff2612ecbd9d8a3972dde9a13bcaeb6e6 Mon Sep 17 00:00:00 2001 From: Phil Allen Date: Tue, 19 Mar 2024 09:51:30 -0700 Subject: [PATCH 3/5] Updates --- Directory.Build.props | 2 +- global.json | 2 +- src/LibraryManager.Build/RestoreTask.cs | 2 +- src/libman/libman.csproj | 1 + test/LibraryManager.Test/Configuration/SettingsTest.cs | 4 ++-- version.json | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 0bbea41d..f89c1a04 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,7 +20,7 @@ true true net481 - net8 + net8.0 diff --git a/global.json b/global.json index b75deba6..d031a763 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "8.0.200", "rollForward": "latestPatch" } } diff --git a/src/LibraryManager.Build/RestoreTask.cs b/src/LibraryManager.Build/RestoreTask.cs index 11b99137..6c1d73f9 100644 --- a/src/LibraryManager.Build/RestoreTask.cs +++ b/src/LibraryManager.Build/RestoreTask.cs @@ -16,7 +16,7 @@ namespace Microsoft.Web.LibraryManager.Build { public class RestoreTask -#if NET481 +#if NETFRAMEWORK : AppDomainIsolatedTask #else : Task diff --git a/src/libman/libman.csproj b/src/libman/libman.csproj index 26ba5f8b..8683633c 100644 --- a/src/libman/libman.csproj +++ b/src/libman/libman.csproj @@ -5,6 +5,7 @@ $(NetCoreTFM) Microsoft.Web.LibraryManager.Tools true + win-x64;win-x86;osx-x64 True Microsoft.Web.LibraryManager.Cli Command line tool for Library Manager diff --git a/test/LibraryManager.Test/Configuration/SettingsTest.cs b/test/LibraryManager.Test/Configuration/SettingsTest.cs index 3f73f613..702b75ae 100644 --- a/test/LibraryManager.Test/Configuration/SettingsTest.cs +++ b/test/LibraryManager.Test/Configuration/SettingsTest.cs @@ -29,7 +29,7 @@ public TestSettings(string configFilePath) [ClassInitialize] public static void Setup(TestContext context) { -#if NET481 +#if NETFRAMEWORK TestFilePath = Path.Combine(context.DeploymentDirectory, "SettingsTest", "libman.config.json"); #else TestFilePath = Environment.ExpandEnvironmentVariables(@"%localappdata%\Microsoft\Library\libman.config.json"); @@ -40,7 +40,7 @@ public static void Setup(TestContext context) [ClassCleanup] public static void Cleanup() { -#if !NET481 +#if !NETFRAMEWORK // cleanup when we're leaving files behind not under the test DeploymentDirectory Directory.Delete(Path.GetDirectoryName(TestFilePath), true); #endif diff --git a/version.json b/version.json index 8c17cdeb..db805c62 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "2.1", + "version": "8.0", "publicRefSpec": [ "^refs/tags/v\\d+\\.\\d+" // we release tags starting with vN.N ] From b9e6ec9900f9de9d5da7c51c0e7c2041ef30c067 Mon Sep 17 00:00:00 2001 From: Phil Allen Date: Tue, 19 Mar 2024 13:13:04 -0700 Subject: [PATCH 4/5] Change version.json to major version 3. --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index db805c62..ff2b85f9 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "8.0", + "version": "3.0", "publicRefSpec": [ "^refs/tags/v\\d+\\.\\d+" // we release tags starting with vN.N ] From f2f518adc1cf416efa108c6b30723f40c70a4ed7 Mon Sep 17 00:00:00 2001 From: Phil Allen Date: Wed, 20 Mar 2024 12:33:09 -0700 Subject: [PATCH 5/5] Restore old SDK for CreateInsertionMetadata --- build/CreateInsertionMetadata.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/CreateInsertionMetadata.proj b/build/CreateInsertionMetadata.proj index 0afc0eca..7fd9ec9c 100644 --- a/build/CreateInsertionMetadata.proj +++ b/build/CreateInsertionMetadata.proj @@ -1,4 +1,4 @@ - + $(NetCoreTFM)