diff --git a/src/dotnet/OSVersionUtil.cs b/src/dotnet/OSVersionUtil.cs
deleted file mode 100644
index b110aa0b5..000000000
--- a/src/dotnet/OSVersionUtil.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System;
-using Microsoft.DotNet.PlatformAbstractions;
-
-namespace Microsoft.DotNet
-{
- class OSVersionUtil
- {
- public static bool IsWindows8OrNewer()
- {
- if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows)
- {
- return false;
- }
-
- if (!Version.TryParse(RuntimeEnvironment.OperatingSystemVersion, out var winVersion))
- {
- // All current versions of Windows have a valid System.Version value for OperatingSystemVersion.
- // If parsing fails, let's assume Windows is newer than Win 8.
- return true;
- }
-
- // Windows 7 = "6.1"
- // Windows 8 = "6.2"
- // Windows 8.1 = "6.3"
- if (winVersion.Major > 6)
- {
- return true;
- }
-
- return winVersion.Minor >= 2;
- }
- }
-}
diff --git a/src/dotnet/ShellShim/ShellShimMaker.cs b/src/dotnet/ShellShim/ShellShimMaker.cs
index e51aa32e1..bf204a1ef 100644
--- a/src/dotnet/ShellShim/ShellShimMaker.cs
+++ b/src/dotnet/ShellShim/ShellShimMaker.cs
@@ -15,30 +15,15 @@ namespace Microsoft.DotNet.ShellShim
{
public class ShellShimMaker
{
- private const string LauncherExeNet45ResourceName = "Microsoft.DotNet.Tools.Launcher.Executable.Net45";
- private const string LauncherExeNet35ResourceName = "Microsoft.DotNet.Tools.Launcher.Executable.Net35";
- private const string LauncherConfigNet45ResourceName = "Microsoft.DotNet.Tools.Launcher.Config.Net45";
- private const string LauncherConfigNet35ResourceName = "Microsoft.DotNet.Tools.Launcher.Config.Net35";
+ private const string LauncherExeResourceName = "Microsoft.DotNet.Tools.Launcher.Executable";
+ private const string LauncherConfigResourceName = "Microsoft.DotNet.Tools.Launcher.Config";
- private readonly string _launcherExeResourceName;
- private readonly string _launcherConfigResourceName;
private readonly string _pathToPlaceShim;
public ShellShimMaker(string pathToPlaceShim)
{
_pathToPlaceShim =
pathToPlaceShim ?? throw new ArgumentNullException(nameof(pathToPlaceShim));
-
- if (OSVersionUtil.IsWindows8OrNewer())
- {
- _launcherExeResourceName = LauncherExeNet45ResourceName;
- _launcherConfigResourceName = LauncherConfigNet45ResourceName;
- }
- else
- {
- _launcherExeResourceName = LauncherExeNet35ResourceName;
- _launcherConfigResourceName = LauncherConfigNet35ResourceName;
- }
}
public void CreateShim(string packageExecutablePath, string shellCommandName)
@@ -49,7 +34,7 @@ namespace Microsoft.DotNet.ShellShim
{
CreateConfigFile(shimPath.Value + ".config", entryPoint: packageExecutablePath, runner: "dotnet");
using (var shim = File.Create(shimPath.Value))
- using (var exe = typeof(ShellShimMaker).Assembly.GetManifestResourceStream(_launcherExeResourceName))
+ using (var exe = typeof(ShellShimMaker).Assembly.GetManifestResourceStream(LauncherExeResourceName))
{
exe.CopyTo(shim);
}
@@ -81,7 +66,7 @@ namespace Microsoft.DotNet.ShellShim
internal void CreateConfigFile(string outputPath, string entryPoint, string runner)
{
XDocument config;
- using (var resource = typeof(ShellShimMaker).Assembly.GetManifestResourceStream(_launcherConfigResourceName))
+ using (var resource = typeof(ShellShimMaker).Assembly.GetManifestResourceStream(LauncherConfigResourceName))
{
config = XDocument.Load(resource);
}
diff --git a/src/dotnet/dotnet.win.targets b/src/dotnet/dotnet.win.targets
index 4e4e56170..d46555d09 100644
--- a/src/dotnet/dotnet.win.targets
+++ b/src/dotnet/dotnet.win.targets
@@ -9,27 +9,16 @@
-
-
-
-
-
-
+
+
-
-
-
-
+
+
diff --git a/src/tool_launcher/app.net45.config b/src/tool_launcher/app.config
similarity index 92%
rename from src/tool_launcher/app.net45.config
rename to src/tool_launcher/app.config
index 989814a58..14df07456 100644
--- a/src/tool_launcher/app.net45.config
+++ b/src/tool_launcher/app.config
@@ -3,6 +3,7 @@ Generated by the .NET Core Command Line.
-->
+
diff --git a/src/tool_launcher/app.net35.config b/src/tool_launcher/app.net35.config
deleted file mode 100644
index 71c90e716..000000000
--- a/src/tool_launcher/app.net35.config
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/tool_launcher/tool_launcher.csproj b/src/tool_launcher/tool_launcher.csproj
index 7adc700e2..26cd41b46 100644
--- a/src/tool_launcher/tool_launcher.csproj
+++ b/src/tool_launcher/tool_launcher.csproj
@@ -1,7 +1,7 @@
-
- net45;net35
+
+ net35
AnyCPU
exe
false
@@ -10,18 +10,10 @@
A simple Windows-only shim for launching new processes.
- app.$(TargetFramework).config
-
-
-
-
-
-
-
-
+
@@ -29,7 +21,7 @@
- $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client
+ $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client