Skip to content

Commit 2cce982

Browse files
phil-allen-msftphil-allen-msft
authored
Update Library Manager build for net8 (#729)
Update Library Manager build for net8 Various fixes to update the LibraryManager repo: Fix LibraryManager.sln so that it defaults to the vsix project Extract TFMs that are likely to change into variables Update to net8 SourceLink is built into net8 SDK, can drop explicit references Update to net481, including source code references Change version.json to major version 3.
1 parent 2ec2978 commit 2cce982

24 files changed

+51
-47
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ ClientBin/
197197
*.publishsettings
198198
node_modules/
199199
orleans.codegen.cs
200+
/.dotnet
200201

201202
# Since there are multiple workflows, uncomment next line to ignore bower_components
202203
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
@@ -269,4 +270,4 @@ __pycache__/
269270
/src/libman/Properties/launchSettings.json
270271

271272
# MSBuild binary log
272-
*.binlog
273+
*.binlog

‎Directory.Build.props

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<PackageOutputPath>$(RepoRoot)\artifacts\$(Configuration)</PackageOutputPath>
2020
<HighEntropyVa>true</HighEntropyVa>
2121
<CheckForOverflowUnderflow Condition=" '$(Configuration)' == 'Debug' ">true</CheckForOverflowUnderflow>
22+
<NetFxTFM>net481</NetFxTFM>
23+
<NetCoreTFM>net8.0</NetCoreTFM>
2224
</PropertyGroup>
2325

2426
<ItemGroup>
@@ -27,7 +29,6 @@
2729
</ItemGroup>
2830

2931
<ItemGroup>
30-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
3132
<PackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild" PrivateAssets="All" />
3233
<PackageReference Include="NerdBank.GitVersioning" PrivateAssets="All" />
3334
</ItemGroup>

‎Directory.Packages.props

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="16.9.0" />
1414
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
1515
<PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" />
16-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
1716
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.7.188" />
1817
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild" Version="2.0.65" />
1918
<PackageVersion Include="Microsoft.VisualStudio.Language.Intellisense" Version="17.7.188" />

‎Install-dotnet.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$url="https://raw.githubusercontent.com/dotnet/cli/release/2.1.3xx/scripts/obtain/dotnet-install.ps1"
1+
$url="https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1"
22
$output="$PSScriptRoot\dotnet-install.ps1"
33
$installDir = Join-Path $PSScriptRoot ".dotnet"
44

55
(New-Object System.Net.WebClient).DownloadFile($url, $output)
6-
Invoke-Expression "& `"$output`" -InstallDir $installDir -Channel release/2.1.3xxx -Version 2.1.300"
6+
Invoke-Expression "& `"$output`" -InstallDir $installDir -Channel 8.0.1xx -Quality ga"

‎LibraryManager.sln

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
88
.editorconfig = .editorconfig
99
.gitattributes = .gitattributes
1010
.gitignore = .gitignore
11-
appveyor.yml = appveyor.yml
1211
CHANGELOG.md = CHANGELOG.md
1312
Directory.Build.props = Directory.Build.props
13+
Directory.Packages.props = Directory.Packages.props
1414
LibraryManager.Settings.targets = LibraryManager.Settings.targets
1515
README.md = README.md
1616
version.json = version.json
1717
EndProjectSection
1818
EndProject
1919
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{A72570B1-99EF-4BDD-B629-321CD56C9F7F}"
2020
ProjectSection(SolutionItems) = preProject
21-
src\Directory.Build.targets = src\Directory.Build.targets
2221
src\.globalconfig = src\.globalconfig
22+
src\Directory.Build.targets = src\Directory.Build.targets
2323
EndProjectSection
2424
EndProject
2525
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}"
2626
EndProject
2727
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E67307E3-04FF-498B-97C7-4F508299DF4D}"
2828
ProjectSection(SolutionItems) = preProject
29+
build\CreateInsertionMetadata.proj = build\CreateInsertionMetadata.proj
2930
build\PackageVersions.targets = build\PackageVersions.targets
3031
EndProjectSection
3132
EndProject
@@ -34,14 +35,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManage
3435
{FF466454-426B-4AD7-8B00-D50011BE716F} = {FF466454-426B-4AD7-8B00-D50011BE716F}
3536
EndProjectSection
3637
EndProject
38+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Web.LibraryManager.Vsix", "src\LibraryManager.Vsix\Microsoft.Web.LibraryManager.Vsix.csproj", "{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}"
39+
EndProject
3740
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Test", "test\LibraryManager.Test\Microsoft.Web.LibraryManager.Test.csproj", "{08C91CC3-4057-4D76-8B9A-B6A0557B64EB}"
3841
EndProject
3942
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Contracts", "src\LibraryManager.Contracts\Microsoft.Web.LibraryManager.Contracts.csproj", "{FF466454-426B-4AD7-8B00-D50011BE716F}"
4043
EndProject
4144
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Mocks", "test\LibraryManager.Mocks\Microsoft.Web.LibraryManager.Mocks.csproj", "{18F82568-446D-4729-B65E-EB9DF21C3636}"
4245
EndProject
43-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Web.LibraryManager.Vsix", "src\LibraryManager.Vsix\Microsoft.Web.LibraryManager.Vsix.csproj", "{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}"
44-
EndProject
4546
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Build", "src\LibraryManager.Build\Microsoft.Web.LibraryManager.Build.csproj", "{7536DF26-B808-4AC2-A9DA-58E408A1E05B}"
4647
EndProject
4748
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}"

‎build/CreateInsertionMetadata.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.Build.NoTargets/1.0.94" DefaultTargets="GenerateInsertionParameters">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>$(NetCoreTFM)</TargetFramework>
55
<InsertionParamsFile>$(RepoRoot)\bin\InsertionParameters.txt</InsertionParamsFile>
66
</PropertyGroup>
77

‎global.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "8.0.200",
4+
"rollForward": "latestPatch"
5+
}
6+
}

‎src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.csproj

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
44
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<PackageTags>library, package, client-side, build</PackageTags>
@@ -13,10 +13,11 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="all"/>
17-
<PackageReference Include="Microsoft.Build.Tasks.Core" PrivateAssets="all"/>
18-
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all"/>
19-
<PackageReference Include="System.Runtime.Loader" Condition="'$(TargetFramework)' == 'netstandard2.0'"/>
16+
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="all" />
17+
<PackageReference Include="Microsoft.Build.Tasks.Core" PrivateAssets="all" />
18+
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all" />
19+
<PackageReference Include="System.Runtime.Loader" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
20+
<Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
2021
</ItemGroup>
2122

2223
<ItemGroup>
@@ -35,6 +36,7 @@
3536
</ItemGroup>
3637

3738
<ItemGroup>
39+
<ProjectReference Include="..\LibraryManager.Contracts\Microsoft.Web.LibraryManager.Contracts.csproj" />
3840
<ProjectReference Include="..\LibraryManager\Microsoft.Web.LibraryManager.csproj" PrivateAssets="all" />
3941
</ItemGroup>
4042

@@ -56,8 +58,7 @@
5658
but before NuGet generates a nuspec. See https://github.com/NuGet/Home/issues/4704.
5759
-->
5860
<ItemGroup>
59-
<_PackageFiles Include="$(OutputPath)\**\Microsoft.Web.LibraryManager*.dll;$(OutputPath)\**\Minimatch.dll;$(OutputPath)\**\Newtonsoft.Json.dll"
60-
Exclude="$(OutputPath)\**\Microsoft.Web.LibraryManager.Build.dll">
61+
<_PackageFiles Include="$(OutputPath)\**\Microsoft.Web.LibraryManager*.dll;$(OutputPath)\**\Minimatch.dll;$(OutputPath)\**\Newtonsoft.Json.dll" Exclude="$(OutputPath)\**\Microsoft.Web.LibraryManager.Build.dll">
6162
<PackagePath>tools\%(RecursiveDir)</PackagePath>
6263
<Visible>false</Visible>
6364
<BuildAction>Content</BuildAction>

‎src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<_ProviderAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netstandard2.0\Microsoft.Web.LibraryManager.dll</_ProviderAssembly>
6-
<_ProviderAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Web.LibraryManager.dll</_ProviderAssembly>
6+
<_ProviderAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\$(NetFxTFM)\Microsoft.Web.LibraryManager.dll</_ProviderAssembly>
77

88
<LibraryProviderAssemblies>
99
$(_ProviderAssembly);

‎src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<_LibraryTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netstandard2.0\Microsoft.Web.LibraryManager.Build.dll</_LibraryTaskAssembly>
6-
<_LibraryTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Web.LibraryManager.Build.dll</_LibraryTaskAssembly>
6+
<_LibraryTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\$(NetFxTFM)\Microsoft.Web.LibraryManager.Build.dll</_LibraryTaskAssembly>
77
</PropertyGroup>
88

99
<PropertyGroup>

‎src/LibraryManager.Build/RestoreTask.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
namespace Microsoft.Web.LibraryManager.Build
1717
{
1818
public class RestoreTask
19-
#if NET472
19+
#if NETFRAMEWORK
2020
: AppDomainIsolatedTask
2121
#else
2222
: Task

‎src/LibraryManager.Contracts/Microsoft.Web.LibraryManager.Contracts.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
44
<PackageTags>library, package, client-side</PackageTags>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -13,7 +13,7 @@
1313
<Target Name="GetCopyToOutputDirectoryItems" />
1414
<Target Name="SatelliteDllsProjectOutputGroup" />
1515
<Target Name="DebugSymbolsProjectOutputGroup" />
16-
<ItemGroup Condition="'$(TargetFramework)'=='net472'">
16+
<ItemGroup Condition="'$(TargetFramework)'=='$(NetFxTFM)'">
1717
<Reference Include="System.Runtime" />
1818
</ItemGroup>
1919
<ItemGroup>
@@ -35,7 +35,7 @@
3535
in the package from their $(OutputPath). -->
3636
<Target Name="FixWinFXSatelliteDllsProjectOutputGroup"
3737
AfterTargets="SatelliteDllsProjectOutputGroup"
38-
Condition="'$(TargetFramework)'=='net472'">
38+
Condition="'$(TargetFramework)'=='$(NetFxTFM)'">
3939
<ItemGroup>
4040
<SatelliteDllsProjectOutputGroupOutput Condition="'%(SatelliteDllsProjectOutputGroupOutput.FinalOutputPath)'==''">
4141
<FinalOutputPath>$(TargetDir)%(SatelliteDllsProjectOutputGroupOutput.TargetPath)</FinalOutputPath>

‎src/LibraryManager.Vsix/Microsoft.Web.LibraryManager.Vsix.csproj

+3-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<OutputPath>$(BaseOutputPath)\$(Configuration)</OutputPath>
1515
<RootNamespace>Microsoft.Web.LibraryManager.Vsix</RootNamespace>
1616
<AssemblyName>Microsoft.Web.LibraryManager.Vsix</AssemblyName>
17-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
17+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
1818
<GeneratePkgDefFile>true</GeneratePkgDefFile>
1919
<TargetVsixContainerName>Microsoft.Web.LibraryManager.vsix</TargetVsixContainerName>
2020
<ExtensionInstallationRoot>Extensions</ExtensionInstallationRoot>
@@ -419,17 +419,13 @@
419419
</Target>
420420
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
421421
<Import Project="$(VsSDKInstall)\Microsoft.VsSDK.targets" Condition="Exists('$(VsSDKInstall)\Microsoft.VsSDK.targets')" />
422-
423422
<Target Name="ResolveNuGetVsixSourceItemFromOutputPath" AfterTargets="GetVsixSourceItems">
424423
<ItemGroup>
425-
<_VsixSourceItemsFromNuGet Include="@(VSIXSourceItem)"
426-
Condition="'%(VSIXSourceItem.NuGetSourceType)' == 'Package'">
424+
<_VsixSourceItemsFromNuGet Include="@(VSIXSourceItem)" Condition="'%(VSIXSourceItem.NuGetSourceType)' == 'Package'">
427425
</_VsixSourceItemsFromNuGet>
428426
<!-- Replace the existing VSIX source items as they are picked up before any signing can occur on them -->
429427
<VSIXSourceItem Remove="@(_VsixSourceItemsFromNuGet)" />
430-
<VSIXSourceItem Include="$(OutputPath)\%(_VsixSourceItemsFromNuGet.FileName)%(_VsixSourceItemsFromNuGet.Extension)"
431-
Condition="Exists('$(OutputPath)\%(_VsixSourceItemsFromNuGet.FileName)%(_VsixSourceItemsFromNuGet.Extension)')" />
428+
<VSIXSourceItem Include="$(OutputPath)\%(_VsixSourceItemsFromNuGet.FileName)%(_VsixSourceItemsFromNuGet.Extension)" Condition="Exists('$(OutputPath)\%(_VsixSourceItemsFromNuGet.FileName)%(_VsixSourceItemsFromNuGet.Extension)')" />
432429
</ItemGroup>
433430
</Target>
434-
435431
</Project>

‎src/LibraryManager.Vsix/Shared/Telemetry.cs

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
using System;
55
using System.Collections.Generic;
66
using System.Linq;
7-
using System.Security.Cryptography;
8-
using System.Text;
97
using Microsoft.VisualStudio.Telemetry;
108
using Microsoft.Web.LibraryManager.Contracts;
119

‎src/LibraryManager/Microsoft.Web.LibraryManager.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
44
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
55
<PackageTags>library, package, client-side</PackageTags>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -43,7 +43,7 @@
4343
in the package from their $(OutputPath). -->
4444
<Target Name="FixWinFXSatelliteDllsProjectOutputGroup"
4545
AfterTargets="SatelliteDllsProjectOutputGroup"
46-
Condition="'$(TargetFramework)'=='net472'">
46+
Condition="'$(TargetFramework)'=='$(NetFxTFM)'">
4747
<ItemGroup>
4848
<SatelliteDllsProjectOutputGroupOutput Condition="'%(SatelliteDllsProjectOutputGroupOutput.FinalOutputPath)'==''">
4949
<FinalOutputPath>$(TargetDir)%(SatelliteDllsProjectOutputGroupOutput.TargetPath)</FinalOutputPath>

‎src/libman/libman.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>$(NetCoreTFM)</TargetFramework>
66
<RootNamespace>Microsoft.Web.LibraryManager.Tools</RootNamespace>
77
<PackAsTool>true</PackAsTool>
88
<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
@@ -11,7 +11,7 @@
1111
<Description>Command line tool for Library Manager</Description>
1212
</PropertyGroup>
1313
<ItemGroup>
14-
<Reference Include="System.Runtime" />
14+
<Reference Include="System.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="all" />

‎test/LibraryManager.IntegrationTest/Microsoft.Web.LibraryManager.IntegrationTest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472</TargetFrameworks>
3+
<TargetFrameworks>$(NetFxTFM)</TargetFrameworks>
44
<!-- Suppress the architecture mismatch warning from the apex package -->
55
<NoWarn>$(NoWarn);MSB3270</NoWarn>
66
</PropertyGroup>

‎test/LibraryManager.Mocks/Microsoft.Web.LibraryManager.Mocks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
44
<PackageTags>mocks, unit test, library, client-side, package</PackageTags>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎test/LibraryManager.Test/Configuration/SettingsTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public TestSettings(string configFilePath)
2929
[ClassInitialize]
3030
public static void Setup(TestContext context)
3131
{
32-
#if NET472
32+
#if NETFRAMEWORK
3333
TestFilePath = Path.Combine(context.DeploymentDirectory, "SettingsTest", "libman.config.json");
3434
#else
3535
TestFilePath = Environment.ExpandEnvironmentVariables(@"%localappdata%\Microsoft\Library\libman.config.json");
@@ -40,7 +40,7 @@ public static void Setup(TestContext context)
4040
[ClassCleanup]
4141
public static void Cleanup()
4242
{
43-
#if !NET472
43+
#if !NETFRAMEWORK
4444
// cleanup when we're leaving files behind not under the test DeploymentDirectory
4545
Directory.Delete(Path.GetDirectoryName(TestFilePath), true);
4646
#endif

‎test/LibraryManager.Test/Microsoft.Web.LibraryManager.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
3+
<TargetFrameworks>$(NetCoreTFM);$(NetFxTFM)</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
66
<Compile Remove="FileHelperTest.cs" />

‎test/Microsoft.Web.LibraryManager.Build.Test/Microsoft.Web.LibraryManager.Build.Test.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net472</TargetFrameworks>
3+
<TargetFrameworks>$(NetCoreTFM);$(NetFxTFM)</TargetFrameworks>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -9,7 +9,7 @@
99
<PackageReference Include="MSTest.TestFramework" />
1010
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="all"/>
1111
<PackageReference Include="Microsoft.Build.Tasks.Core" PrivateAssets="all"/>
12-
<PackageReference Include="System.Runtime.Loader" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
12+
<PackageReference Include="System.Runtime.Loader" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎test/Microsoft.Web.LibraryManager.Vsix.Test/Microsoft.Web.LibraryManager.Vsix.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472</TargetFrameworks>
3+
<TargetFrameworks>$(NetFxTFM)</TargetFrameworks>
44
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
55
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
66
</PropertyGroup>

‎test/libman.Test/libman.Test.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>$(NetCoreTFM)</TargetFramework>
44
<RootNamespace>Microsoft.Web.LibraryManager.Tools.Test</RootNamespace>
55
</PropertyGroup>
66
<ItemGroup>
@@ -12,6 +12,7 @@
1212

1313
<ItemGroup>
1414
<ProjectReference Include="..\..\Src\libman\libman.csproj" />
15+
<ProjectReference Include="..\..\src\LibraryManager.Contracts\Microsoft.Web.LibraryManager.Contracts.csproj" />
1516
<ProjectReference Include="..\LibraryManager.Mocks\Microsoft.Web.LibraryManager.Mocks.csproj" />
1617
</ItemGroup>
1718

‎version.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.1",
3+
"version": "3.0",
44
"publicRefSpec": [
55
"^refs/tags/v\\d+\\.\\d+" // we release tags starting with vN.N
66
]

0 commit comments

Comments
 (0)