Skip to content

Update Library Manager build for net8 #729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 20, 2024
Merged

Update Library Manager build for net8 #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e36cfb
Fix LibraryManager.sln so that it defaults to the vsix project
phil-allen-msft Mar 1, 2024
f1a0eb7
Various fixes to update the LibraryManager repo
phil-allen-msft Mar 7, 2024
3f5981c
Updates
phil-allen-msft Mar 19, 2024
b9e6ec9
Change version.json to major version 3.
phil-allen-msft Mar 19, 2024
f2f518a
Restore old SDK for CreateInsertionMetadata
phil-allen-msft Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -269,4 +270,4 @@ __pycache__/
/src/libman/Properties/launchSettings.json

# MSBuild binary log
*.binlog
*.binlog
3 changes: 2 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<PackageOutputPath>$(RepoRoot)\artifacts\$(Configuration)</PackageOutputPath>
<HighEntropyVa>true</HighEntropyVa>
<CheckForOverflowUnderflow Condition=" '$(Configuration)' == 'Debug' ">true</CheckForOverflowUnderflow>
<NetFxTFM>net481</NetFxTFM>
<NetCoreTFM>net8.0</NetCoreTFM>
</PropertyGroup>

<ItemGroup>
Expand All @@ -27,7 +29,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild" PrivateAssets="All" />
<PackageReference Include="NerdBank.GitVersioning" PrivateAssets="All" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="16.9.0" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.7.188" />
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild" Version="2.0.65" />
<PackageVersion Include="Microsoft.VisualStudio.Language.Intellisense" Version="17.7.188" />
Expand Down
4 changes: 2 additions & 2 deletions Install-dotnet.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
9 changes: 5 additions & 4 deletions LibraryManager.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@ 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
EndProjectSection
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
Expand All @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion build/CreateInsertionMetadata.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.Build.NoTargets/1.0.94" DefaultTargets="GenerateInsertionParameters">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>$(NetCoreTFM)</TargetFramework>
<InsertionParamsFile>$(RepoRoot)\bin\InsertionParameters.txt</InsertionParamsFile>
</PropertyGroup>

Expand Down
6 changes: 6 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "8.0.200",
"rollForward": "latestPatch"
}
}
15 changes: 8 additions & 7 deletions src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PackageTags>library, package, client-side, build</PackageTags>
Expand All @@ -13,10 +13,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="all"/>
<PackageReference Include="Microsoft.Build.Tasks.Core" PrivateAssets="all"/>
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all"/>
<PackageReference Include="System.Runtime.Loader" Condition="'$(TargetFramework)' == 'netstandard2.0'"/>
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="all" />
<PackageReference Include="Microsoft.Build.Tasks.Core" PrivateAssets="all" />
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all" />
<PackageReference Include="System.Runtime.Loader" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
<Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
</ItemGroup>

<ItemGroup>
Expand All @@ -35,6 +36,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\LibraryManager.Contracts\Microsoft.Web.LibraryManager.Contracts.csproj" />
<ProjectReference Include="..\LibraryManager\Microsoft.Web.LibraryManager.csproj" PrivateAssets="all" />
</ItemGroup>

Expand All @@ -56,8 +58,7 @@
but before NuGet generates a nuspec. See https://github.com/NuGet/Home/issues/4704.
-->
<ItemGroup>
<_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">
<PackagePath>tools\%(RecursiveDir)</PackagePath>
<Visible>false</Visible>
<BuildAction>Content</BuildAction>
Expand Down
2 changes: 1 addition & 1 deletion src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

<LibraryProviderAssemblies>
$(_ProviderAssembly);
Expand Down
2 changes: 1 addition & 1 deletion src/LibraryManager.Build/Microsoft.Web.LibraryManager.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/LibraryManager.Build/RestoreTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
namespace Microsoft.Web.LibraryManager.Build
{
public class RestoreTask
#if NET472
#if NETFRAMEWORK
: AppDomainIsolatedTask
#else
: Task
Expand Down
6 changes: 3 additions & 3 deletions src/LibraryManager.Contracts/Microsoft.Web.LibraryManager.Contracts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
<PackageTags>library, package, client-side</PackageTags>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -13,7 +13,7 @@
<Target Name="GetCopyToOutputDirectoryItems" />
<Target Name="SatelliteDllsProjectOutputGroup" />
<Target Name="DebugSymbolsProjectOutputGroup" />
<ItemGroup Condition="'$(TargetFramework)'=='net472'">
<ItemGroup Condition="'$(TargetFramework)'=='$(NetFxTFM)'">
<Reference Include="System.Runtime" />
</ItemGroup>
<ItemGroup>
Expand All @@ -35,7 +35,7 @@
in the package from their $(OutputPath). -->
<Target Name="FixWinFXSatelliteDllsProjectOutputGroup"
AfterTargets="SatelliteDllsProjectOutputGroup"
Condition="'$(TargetFramework)'=='net472'">
Condition="'$(TargetFramework)'=='$(NetFxTFM)'">
<ItemGroup>
<SatelliteDllsProjectOutputGroupOutput Condition="'%(SatelliteDllsProjectOutputGroupOutput.FinalOutputPath)'==''">
<FinalOutputPath>$(TargetDir)%(SatelliteDllsProjectOutputGroupOutput.TargetPath)</FinalOutputPath>
Expand Down
10 changes: 3 additions & 7 deletions src/LibraryManager.Vsix/Microsoft.Web.LibraryManager.Vsix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<OutputPath>$(BaseOutputPath)\$(Configuration)</OutputPath>
<RootNamespace>Microsoft.Web.LibraryManager.Vsix</RootNamespace>
<AssemblyName>Microsoft.Web.LibraryManager.Vsix</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<GeneratePkgDefFile>true</GeneratePkgDefFile>
<TargetVsixContainerName>Microsoft.Web.LibraryManager.vsix</TargetVsixContainerName>
<ExtensionInstallationRoot>Extensions</ExtensionInstallationRoot>
Expand Down Expand Up @@ -419,17 +419,13 @@
</Target>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VsSDKInstall)\Microsoft.VsSDK.targets" Condition="Exists('$(VsSDKInstall)\Microsoft.VsSDK.targets')" />

<Target Name="ResolveNuGetVsixSourceItemFromOutputPath" AfterTargets="GetVsixSourceItems">
<ItemGroup>
<_VsixSourceItemsFromNuGet Include="@(VSIXSourceItem)"
Condition="'%(VSIXSourceItem.NuGetSourceType)' == 'Package'">
<_VsixSourceItemsFromNuGet Include="@(VSIXSourceItem)" Condition="'%(VSIXSourceItem.NuGetSourceType)' == 'Package'">
</_VsixSourceItemsFromNuGet>
<!-- Replace the existing VSIX source items as they are picked up before any signing can occur on them -->
<VSIXSourceItem Remove="@(_VsixSourceItemsFromNuGet)" />
<VSIXSourceItem Include="$(OutputPath)\%(_VsixSourceItemsFromNuGet.FileName)%(_VsixSourceItemsFromNuGet.Extension)"
Condition="Exists('$(OutputPath)\%(_VsixSourceItemsFromNuGet.FileName)%(_VsixSourceItemsFromNuGet.Extension)')" />
<VSIXSourceItem Include="$(OutputPath)\%(_VsixSourceItemsFromNuGet.FileName)%(_VsixSourceItemsFromNuGet.Extension)" Condition="Exists('$(OutputPath)\%(_VsixSourceItemsFromNuGet.FileName)%(_VsixSourceItemsFromNuGet.Extension)')" />
</ItemGroup>
</Target>

</Project>
2 changes: 0 additions & 2 deletions src/LibraryManager.Vsix/Shared/Telemetry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/LibraryManager/Microsoft.Web.LibraryManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<PackageTags>library, package, client-side</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down Expand Up @@ -43,7 +43,7 @@
in the package from their $(OutputPath). -->
<Target Name="FixWinFXSatelliteDllsProjectOutputGroup"
AfterTargets="SatelliteDllsProjectOutputGroup"
Condition="'$(TargetFramework)'=='net472'">
Condition="'$(TargetFramework)'=='$(NetFxTFM)'">
<ItemGroup>
<SatelliteDllsProjectOutputGroupOutput Condition="'%(SatelliteDllsProjectOutputGroupOutput.FinalOutputPath)'==''">
<FinalOutputPath>$(TargetDir)%(SatelliteDllsProjectOutputGroupOutput.TargetPath)</FinalOutputPath>
Expand Down
4 changes: 2 additions & 2 deletions src/libman/libman.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>$(NetCoreTFM)</TargetFramework>
<RootNamespace>Microsoft.Web.LibraryManager.Tools</RootNamespace>
<PackAsTool>true</PackAsTool>
<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
Expand All @@ -11,7 +11,7 @@
<Description>Command line tool for Library Manager</Description>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how does this version get resolved in the future? I.e. when updating to dotnet 10, will this break or does it get re-resolved to the version=10.0.0.0 assembly?

</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="all" />
Expand Down
2 changes: 1 addition & 1 deletion test/LibraryManager.IntegrationTest/Microsoft.Web.LibraryManager.IntegrationTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
<TargetFrameworks>$(NetFxTFM)</TargetFrameworks>
<!-- Suppress the architecture mismatch warning from the apex package -->
<NoWarn>$(NoWarn);MSB3270</NoWarn>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/LibraryManager.Mocks/Microsoft.Web.LibraryManager.Mocks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
<PackageTags>mocks, unit test, library, client-side, package</PackageTags>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
4 changes: 2 additions & 2 deletions test/LibraryManager.Test/Configuration/SettingsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/LibraryManager.Test/Microsoft.Web.LibraryManager.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<TargetFrameworks>$(NetCoreTFM);$(NetFxTFM)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Remove="FileHelperTest.cs" />
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.Web.LibraryManager.Build.Test/Microsoft.Web.LibraryManager.Build.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<TargetFrameworks>$(NetCoreTFM);$(NetFxTFM)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -9,7 +9,7 @@
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="all"/>
<PackageReference Include="Microsoft.Build.Tasks.Core" PrivateAssets="all"/>
<PackageReference Include="System.Runtime.Loader" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<PackageReference Include="System.Runtime.Loader" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.Web.LibraryManager.Vsix.Test/Microsoft.Web.LibraryManager.Vsix.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
<TargetFrameworks>$(NetFxTFM)</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
Expand Down
5 changes: 3 additions & 2 deletions test/libman.Test/libman.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>$(NetCoreTFM)</TargetFramework>
<RootNamespace>Microsoft.Web.LibraryManager.Tools.Test</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand All @@ -12,6 +12,7 @@

<ItemGroup>
<ProjectReference Include="..\..\Src\libman\libman.csproj" />
<ProjectReference Include="..\..\src\LibraryManager.Contracts\Microsoft.Web.LibraryManager.Contracts.csproj" />
<ProjectReference Include="..\LibraryManager.Mocks\Microsoft.Web.LibraryManager.Mocks.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
]
Expand Down