Skip to content
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

lib: find extensive Win10SDK installation #2259

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

lib: find extensive Win10SDK installation #2259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e98bb16
doc: drop the --production flag for installing windows-build-tools
DeeDeeG Aug 29, 2020
d1176d7
ci: switch to GitHub Actions
codebytere May 13, 2020
9bf112b
doc: replace status badges with new Actions badge
rvagg Sep 9, 2020
4775803
restore
mcdmaster Oct 26, 2020
574677d
lib: find extensive Win10SDK installation
mcdmaster Nov 13, 2020
e1d0a4a
lib: find extensive Win10SDK installation
mcdmaster Nov 13, 2020
bb5c21c
lib: find extensive Win10SDK installation
mcdmaster Nov 13, 2020
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
51 changes: 0 additions & 51 deletions .github/workflows/tests.yml
View file
Open in desktop

This file was deleted.

60 changes: 54 additions & 6 deletions lib/Find-VisualStudio.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Text;
using System.Runtime.InteropServices;
using System.Collections.Generic;
using System.Text.RegularExpressions;

namespace VisualStudioConfiguration
{
Expand Down Expand Up @@ -196,12 +197,13 @@ public static void PrintJson()
int pceltFetched;
ISetupInstance2[] rgelt = new ISetupInstance2[1];
List<string> instances = new List<string>();

while (true)
{
e.Next(1, rgelt, out pceltFetched);
if (pceltFetched <= 0)
{
Console.WriteLine(String.Format("[{0}]", string.Join(",", instances.ToArray())));
Console.Write(String.Format("[{0}]", string.Join(",", instances.ToArray())));
return;
}

Expand All @@ -216,6 +218,25 @@ public static void PrintJson()
}
}

private static string CheckInstance(ISetupPackageReference package)
{
// Visual Studio Community 2017 component directory:
// https://www.visualstudio.com/en-us/productinfo/vs2017-install-product-Community.workloads
String Win10SDKVer = null;

const string Win10SDKPrefix = "Microsoft.VisualStudio.Component.Windows10SDK.";
String id = package.GetId();
if (id.StartsWith(Win10SDKPrefix))
{
String[] parts = id.Substring(Win10SDKPrefix.Length).Split('.');
String foundSdkVer = parts[4];
Win10SDKVer = String.Compare(Win10SDKVer, foundSdkVer) > 0 ? Win10SDKVer : foundSdkVer;
return String.Format("{0}.{1}", id, Win10SDKVer);
}
// "Microsoft.VisualStudio.Component.Windows81SDK" as well
return id;
}

private static string JsonString(string s)
{
return "\"" + s.Replace("\\", "\\\\").Replace("\"", "\\\"") + "\"";
Expand All @@ -225,7 +246,6 @@ private static string InstanceJson(ISetupInstance2 setupInstance2)
{
// Visual Studio component directory:
// https://docs.microsoft.com/en-us/visualstudio/install/workload-and-component-ids

StringBuilder json = new StringBuilder();
json.Append("{");

Expand All @@ -238,13 +258,41 @@ private static string InstanceJson(ISetupInstance2 setupInstance2)
List<string> packages = new List<string>();
foreach (ISetupPackageReference package in setupInstance2.GetPackages())
{
string id = JsonString(package.GetId());
string id = JsonString(CheckInstance(package));
packages.Add(id);
}
json.Append(String.Format("\"packages\":[{0}]", string.Join(",", packages.ToArray())));
json.Append(String.Format("\"packages\":[{0}", string.Join(",", packages.ToArray())));

String jsonResultString = json.ToString();
if (!jsonResultString.Contains("Windows10SDK"))
{
System.Diagnostics.Process cmd = new System.Diagnostics.Process();
cmd.StartInfo.FileName = "cmd.exe";
cmd.StartInfo.RedirectStandardInput = true;
cmd.StartInfo.RedirectStandardOutput = true;
cmd.StartInfo.CreateNoWindow = true;
cmd.StartInfo.UseShellExecute = false;
cmd.Start();

cmd.StandardInput.WriteLine("@echo off");
cmd.StandardInput.Flush();
cmd.StandardInput.WriteLine(
String.Format("{0}\\VC\\Auxiliary\\Build\\vcvarsall.bat x64", path)
);
cmd.StandardInput.Flush();
cmd.StandardInput.WriteLine("@echo %UCRTVersion%");
cmd.StandardInput.Flush();
cmd.StandardInput.Close();
cmd.WaitForExit();
String SDKFullText = cmd.StandardOutput.ReadToEnd();
int pos = SDKFullText.IndexOf("[Version ");
String SDKVersion = SDKFullText.Substring(pos + 14, 5);
json.Append(String.Format(",\"Microsoft.VisualStudio.Component.Windows10SDK.{0}\"", SDKVersion));
cmd.Close();
}
json.Append("]}");

json.Append("}");
return json.ToString();
}
}
}
}