Updates

phil-allen-msft · phil-allen-msft · commit 3f5981cff261 · 2024-03-19T09:51:30.000-07:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -20,7 +20,7 @@
     <HighEntropyVa>true</HighEntropyVa>
     <CheckForOverflowUnderflow Condition=" '$(Configuration)' == 'Debug' ">true</CheckForOverflowUnderflow>
     <NetFxTFM>net481</NetFxTFM>
-    <NetCoreTFM>net8</NetCoreTFM>
+    <NetCoreTFM>net8.0</NetCoreTFM>
   </PropertyGroup>
 
   <ItemGroup>
diff --git 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
@@ -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
@@ -5,6 +5,7 @@
     <TargetFramework>$(NetCoreTFM)</TargetFramework>
     <RootNamespace>Microsoft.Web.LibraryManager.Tools</RootNamespace>
     <PackAsTool>true</PackAsTool>
+    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Microsoft.Web.LibraryManager.Cli</PackageId>
     <Description>Command line tool for Library Manager</Description>
diff --git 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
@@ -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
   ]

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.100",`
	`3`	`+ "version": "8.0.200",`
`4`	`4`	`"rollForward": "latestPatch"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`namespace Microsoft.Web.LibraryManager.Build`
`17`	`17`	`{`
`18`	`18`	`public class RestoreTask`
`19`		`-#if NET481`
	`19`	`+#if NETFRAMEWORK`
`20`	`20`	`: AppDomainIsolatedTask`
`21`	`21`	`#else`
`22`	`22`	`: Task`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "2.1",`
	`3`	`+ "version": "8.0",`
`4`	`4`	`"publicRefSpec": [`
`5`	`5`	`"^refs/tags/v\\d+\\.\\d+" // we release tags starting with vN.N`
`6`	`6`	`]`