support for desktop .net

filipw · filipw · commit 96601acb5e64 · 2018-05-02T16:07:57.000+02:00
diff --git a/src/Dotnet.Script.Core/ScriptCompiler.cs b/src/Dotnet.Script.Core/ScriptCompiler.cs
@@ -76,6 +76,20 @@ public virtual ScriptOptions CreateScriptOptions(ScriptContext context, IList<Ru
                 .WithEmitDebugInformation(true)
                 .WithFileEncoding(context.Code.Encoding);
 
+            // if the framework is not Core CLR, add GAC references
+            if (!ScriptEnvironment.Default.IsNetCore)
+            {
+                opts = opts.AddReferences(
+                    "System",
+                    "System.Core",
+                    "System.Data",
+                    "System.Data.DataSetExtensions",
+                    "System.Xml",
+                    "System.Xml.Linq",
+                    "System.Net.Http",
+                    "Microsoft.CSharp");
+            }
+
             if (!string.IsNullOrWhiteSpace(context.FilePath))
             {
                 opts = opts.WithFilePath(context.FilePath);
diff --git a/src/Dotnet.Script.DependencyModel/Environment/ScriptEnvironment.cs b/src/Dotnet.Script.DependencyModel/Environment/ScriptEnvironment.cs
@@ -22,6 +22,8 @@ public class ScriptEnvironment
 
         private readonly Lazy<string> _nuGetStoreFolder;
 
+        private string _overrriddenTargetFramework;
+
         private ScriptEnvironment()
         {
             _targetFramework = new Lazy<string>(GetNetCoreAppVersion);
@@ -38,14 +40,26 @@ private ScriptEnvironment()
 
         public string RuntimeIdentifier => _runtimeIdentifier.Value;
 
-        public string TargetFramework => _targetFramework.Value;
+        public string TargetFramework => _overrriddenTargetFramework ?? _targetFramework.Value;
 
         public string InstallLocation => _installLocation.Value;
 
         public string ProccessorArchitecture => RuntimeEnvironment.RuntimeArchitecture;
 
         public string NuGetStoreFolder => _nuGetStoreFolder.Value;
 
+        public bool IsNetCore => TargetFramework.StartsWith("netcoreapp", StringComparison.InvariantCultureIgnoreCase);
+
+        public void OverrideTargetFramework(string targetFramework)
+        {
+            if (_targetFramework.IsValueCreated)
+            {
+                throw new InvalidOperationException($"Cannot override target framework because a value {_targetFramework.Value} has already been resolved and used.");
+            }
+
+            _overrriddenTargetFramework = targetFramework;
+        }
+
         private static string GetPlatformIdentifier()
         {
             if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Darwin) return "osx";
