Rename IApplicationEnvironment.TargetFramework to RuntimeFramework

aspnet · Sep 10, 2014 · 824ce45 · 824ce45
1 parent 1de4bbf
commit 824ce45
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/src/Microsoft.Framework.ApplicationHost/Program.cs b/src/Microsoft.Framework.ApplicationHost/Program.cs
@@ -111,7 +111,7 @@ private string GetVariable(string key)
             }
             if (string.Equals(key, "env:TargetFramework", StringComparison.OrdinalIgnoreCase))
             {
-                return _environment.TargetFramework.Identifier;
+                return _environment.RuntimeFramework.Identifier;
             }
             return Environment.GetEnvironmentVariable(key);
         }
@@ -153,7 +153,7 @@ private bool ParseArgs(string[] args, out DefaultHostOptions defaultHostOptions,
             defaultHostOptions.WatchFiles = optionWatch.HasValue();
             defaultHostOptions.PackageDirectory = optionPackages.Value();
 
-            defaultHostOptions.TargetFramework = _environment.TargetFramework;
+            defaultHostOptions.TargetFramework = _environment.RuntimeFramework;
             defaultHostOptions.Configuration = optionConfiguration.Value() ?? _environment.Configuration ?? "Debug";
             defaultHostOptions.ApplicationBaseDirectory = _environment.ApplicationBasePath;
             var portValue = optionCompilationServer.Value() ?? Environment.GetEnvironmentVariable("KRE_COMPILATION_SERVER_PORT");

diff --git a/src/Microsoft.Framework.PackageManager/Building/BuildManager.cs b/src/Microsoft.Framework.PackageManager/Building/BuildManager.cs
@@ -87,7 +87,7 @@ public bool Build()
             var host = new DefaultHost(new DefaultHostOptions()
             {
                 ApplicationBaseDirectory = project.ProjectDirectory,
-                TargetFramework = applicationEnvironment.TargetFramework,
+                TargetFramework = applicationEnvironment.RuntimeFramework,
                 Configuration = applicationEnvironment.Configuration
             },
             _hostServices);

diff --git a/src/Microsoft.Framework.PackageManager/Program.cs b/src/Microsoft.Framework.PackageManager/Program.cs
@@ -120,7 +120,7 @@ public int Main(string[] args)
                         ProjectDir = argProject.Value ?? System.IO.Directory.GetCurrentDirectory(),
                         AppFolder = optionAppFolder.Value(),
                         Configuration = optionConfiguration.Value() ?? "Debug",
-                        RuntimeTargetFramework = _environment.TargetFramework,
+                        RuntimeTargetFramework = _environment.RuntimeFramework,
                         Overwrite = optionOverwrite.HasValue(),
                         NoSource = optionNoSource.HasValue(),
                         Runtimes = optionRuntime.HasValue() ?
@@ -154,7 +154,7 @@ public int Main(string[] args)
                 c.OnExecute(() =>
                 {
                     var buildOptions = new BuildOptions();
-                    buildOptions.RuntimeTargetFramework = _environment.TargetFramework;
+                    buildOptions.RuntimeTargetFramework = _environment.RuntimeFramework;
                     buildOptions.OutputDir = optionOut.Value();
                     buildOptions.ProjectDir = argProjectDir.Value ?? Directory.GetCurrentDirectory();
                     buildOptions.Configurations = optionConfiguration.Values;

diff --git a/src/Microsoft.Framework.PackageManager/Restore/RestoreCommand.cs b/src/Microsoft.Framework.PackageManager/Restore/RestoreCommand.cs
@@ -197,7 +197,7 @@ private async Task<bool> RestoreForProject(string projectJsonPath, string rootDi
             {
                 contexts.Add(new RestoreContext
                 {
-                    FrameworkName = ApplicationEnvironment.TargetFramework,
+                    FrameworkName = ApplicationEnvironment.RuntimeFramework,
                     ProjectLibraryProviders = projectProviders,
                     LocalLibraryProviders = localProviders,
                     RemoteLibraryProviders = remoteProviders,
@@ -281,7 +281,7 @@ private async Task<bool> RestoreFromGlobalJson(string rootDirectory, string pack
 
             var context = new RestoreContext
             {
-                FrameworkName = ApplicationEnvironment.TargetFramework,
+                FrameworkName = ApplicationEnvironment.RuntimeFramework,
                 ProjectLibraryProviders = new List<IWalkProvider>(),
                 LocalLibraryProviders = localProviders,
                 RemoteLibraryProviders = remoteProviders,

diff --git a/src/Microsoft.Framework.Runtime.Interfaces/IApplicationEnvironment.cs b/src/Microsoft.Framework.Runtime.Interfaces/IApplicationEnvironment.cs
@@ -12,6 +12,6 @@ public interface IApplicationEnvironment
         string Version { get; }
         string ApplicationBasePath { get; }
         string Configuration { get; }
-        FrameworkName TargetFramework { get; }
+        FrameworkName RuntimeFramework { get; }
     }
 }
diff --git a/src/Microsoft.Framework.Runtime/ApplicationEnvironment.cs b/src/Microsoft.Framework.Runtime/ApplicationEnvironment.cs
@@ -45,7 +45,7 @@ public string Version
         public string Configuration { get; private set; }
 
 
-        public FrameworkName TargetFramework
+        public FrameworkName RuntimeFramework
         {
             get { return _targetFramework; }
         }

diff --git a/src/klr.host/ApplicationEnvironment.cs b/src/klr.host/ApplicationEnvironment.cs
@@ -15,7 +15,7 @@ public ApplicationEnvironment(string appBase, FrameworkName targetFramework, str
             ApplicationName = assemblyName.Name;
             Version = assemblyName.Version.ToString();
             ApplicationBasePath = appBase;
-            TargetFramework = targetFramework;
+            RuntimeFramework = targetFramework;
             Configuration = configuration;
         }
 
@@ -43,7 +43,7 @@ public string ApplicationBasePath
             private set;
         }
 
-        public FrameworkName TargetFramework
+        public FrameworkName RuntimeFramework
         {
             get;
             private set;