using NET461 constant instead of NETDESKTOP

arturcic · arturcic · commit 89a3535d1a6c · 2019-07-31T12:04:05.000+03:00
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
@@ -14,10 +14,6 @@
     <Product>$(AssemblyName)</Product>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-    <DefineConstants>NETDESKTOP</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
     <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
@@ -12,10 +12,6 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='net461'">
-    <DefineConstants>NETDESKTOP</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup Condition="'$(TargetFramework)'=='net461'">
     <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
   </ItemGroup>
diff --git a/src/GitVersionExe/Program.cs b/src/GitVersionExe/Program.cs
@@ -77,7 +77,7 @@ static int VerifyArgumentsAndRun()
                 }
 
                 ConfigureLogging(arguments);
-#if NETDESKTOP
+#if NET461
                 if (arguments.Diag)
                 {
                     Logger.WriteInfo("Dumping commit graph: ");
@@ -131,7 +131,7 @@ static int VerifyArgumentsAndRun()
 
                     try
                     {
-#if NETDESKTOP
+#if NET461
                         LibGitExtensions.DumpGraph(arguments.TargetPath, Logger.WriteInfo, 100);
 #endif
                     }
diff --git a/src/GitVersionExe/SpecifiedArgumentRunner.cs b/src/GitVersionExe/SpecifiedArgumentRunner.cs
@@ -69,7 +69,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)
                 }
                 var execRun = false;
                 var msbuildRun = false;
-#if NETDESKTOP
+#if NET461
                 execRun = RunExecCommandIfNeeded(arguments, targetPath, variables);
                 msbuildRun = RunMsBuildIfNeeded(arguments, targetPath, variables);
 #endif
@@ -87,7 +87,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)
                 }
             }
         }
-#if NETDESKTOP
+#if NET461
         static bool RunMsBuildIfNeeded(Arguments args, string workingDirectory, VersionVariables variables)
         {
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ static int VerifyArgumentsAndRun()`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`ConfigureLogging(arguments);`
`80`		`-#if NETDESKTOP`
	`80`	`+#if NET461`
`81`	`81`	`if (arguments.Diag)`
`82`	`82`	`{`
`83`	`83`	`Logger.WriteInfo("Dumping commit graph: ");`
`@@ -131,7 +131,7 @@ static int VerifyArgumentsAndRun()`
`131`	`131`
`132`	`132`	`try`
`133`	`133`	`{`
`134`		`-#if NETDESKTOP`
	`134`	`+#if NET461`
`135`	`135`	`LibGitExtensions.DumpGraph(arguments.TargetPath, Logger.WriteInfo, 100);`
`136`	`136`	`#endif`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)`
`69`	`69`	`}`
`70`	`70`	`var execRun = false;`
`71`	`71`	`var msbuildRun = false;`
`72`		`-#if NETDESKTOP`
	`72`	`+#if NET461`
`73`	`73`	`execRun = RunExecCommandIfNeeded(arguments, targetPath, variables);`
`74`	`74`	`msbuildRun = RunMsBuildIfNeeded(arguments, targetPath, variables);`
`75`	`75`	`#endif`
`@@ -87,7 +87,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`
`90`		`-#if NETDESKTOP`
	`90`	`+#if NET461`
`91`	`91`	`static bool RunMsBuildIfNeeded(Arguments args, string workingDirectory, VersionVariables variables)`
`92`	`92`	`{`
`93`	`93`