diff --git a/.gitignore b/.gitignore index 5db42414d..7d132f059 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 36d057ed4..f89c1a04f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -19,6 +19,8 @@ $(RepoRoot)\artifacts\$(Configuration) true true + net481 + net8.0 @@ -27,7 +29,6 @@ - diff --git a/Directory.Packages.props b/Directory.Packages.props index 91fc71adc..14c41c6c7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,7 +13,6 @@ - diff --git a/Install-dotnet.ps1 b/Install-dotnet.ps1 index 3a1839614..f79bfab26 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/LibraryManager.sln b/LibraryManager.sln index f6002a802..04502852d 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}" diff --git a/build/CreateInsertionMetadata.proj b/build/CreateInsertionMetadata.proj index c6f7d159e..7fd9ec9c0 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 000000000..d031a7632 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "8.0.200", + "rollForward": "latestPatch" + } +} diff --git a/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.csproj b/src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.csproj index 683f42f59..dba5672d2 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 6f9dc2d95..05c54d69a 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 a8fd9da98..401fecd42 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 c8ecc713a..6c1d73f90 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 NETFRAMEWORK : AppDomainIsolatedTask #else : Task diff --git a/src/LibraryManager.Contracts/Microsoft.Web.LibraryManager.Contracts.csproj b/src/LibraryManager.Contracts/Microsoft.Web.LibraryManager.Contracts.csproj index 567f105a4..602d53f7f 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 db631d92e..c21dc0f6c 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 f331f085f..686c131b6 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 82ef17814..45b183c2a 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 8560bc9e8..8683633c4 100644 --- a/src/libman/libman.csproj +++ b/src/libman/libman.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + $(NetCoreTFM) Microsoft.Web.LibraryManager.Tools true win-x64;win-x86;osx-x64 @@ -11,7 +11,7 @@ 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 ab89de001..7dee9d5ec 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 929e44e53..84d266776 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 64bf0b053..702b75ae8 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 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 !NET472 +#if !NETFRAMEWORK // 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 0d952cc2c..40d162b20 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 7f541826c..55686afcf 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 3280dd411..024e73a55 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 62d240658..c3c49dca7 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 @@ + diff --git a/version.json b/version.json index 8c17cdeb1..ff2b85f99 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": "3.0", "publicRefSpec": [ "^refs/tags/v\\d+\\.\\d+" // we release tags starting with vN.N ]