diff --git a/Source/Tools/Flax.Build/Platforms/UWP/UWPPlatform.cs b/Source/Tools/Flax.Build/Platforms/UWP/UWPPlatform.cs index 221483536..bec8b583c 100644 --- a/Source/Tools/Flax.Build/Platforms/UWP/UWPPlatform.cs +++ b/Source/Tools/Flax.Build/Platforms/UWP/UWPPlatform.cs @@ -20,6 +20,13 @@ namespace Flax.Build.Platforms /// public UWPPlatform() { + // Skip if running on non-Windows system + if (Platform.BuildTargetPlatform != TargetPlatform.Windows) + { + _hasRequiredSDKsInstalled = false; + return; + } + // Visual Studio 2017+ supported only var visualStudio = VisualStudioInstance.GetInstances().FirstOrDefault(x => x.Version == VisualStudioVersion.VisualStudio2017 || x.Version == VisualStudioVersion.VisualStudio2019); if (visualStudio == null) diff --git a/Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs b/Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs index fca112e9c..7c1a78c81 100644 --- a/Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs +++ b/Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs @@ -243,9 +243,14 @@ namespace Flax.Build.Platforms { if (_toolsets != null) return _toolsets; - var vsInstances = VisualStudioInstance.GetInstances(); _toolsets = new Dictionary(); + // Skip if running on non-Windows system + if (BuildTargetPlatform != TargetPlatform.Windows) + return _toolsets; + + var vsInstances = VisualStudioInstance.GetInstances(); + // Visual Studio 2015 - single instance var vs2015 = vsInstances.FirstOrDefault(x => x.Version == VisualStudioVersion.VisualStudio2015); if (vs2015 != null) diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioInstance.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioInstance.cs index 4c4250aab..6d39625f9 100644 --- a/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioInstance.cs +++ b/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioInstance.cs @@ -97,9 +97,13 @@ namespace Flax.Build.Projects.VisualStudio { _installDirs = new List(); + // Skip if running on non-Windows system + if (Platform.BuildTargetPlatform != TargetPlatform.Windows) + return _installDirs; + if (Environment.OSVersion.Platform == PlatformID.Win32NT) { - // Visual Studio 2017-2020 + // Visual Studio 2017-2019 List preReleaseInstallDirs = null; try {