Use target framework from ScriptEnvironment

seesharper · seesharper · commit 03004ba7d781 · 2022-11-24T22:01:12.000+01:00
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100-rc.1.22431.12",
+    "version": "7.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/Dotnet.Script.DependencyModel/Context/ScriptDependencyContextReader.cs b/src/Dotnet.Script.DependencyModel/Context/ScriptDependencyContextReader.cs
@@ -87,10 +87,9 @@ public ScriptDependencyContext ReadDependencyContext(string pathToAssetsFile)
         private bool HasAspNetCoreFrameworkReference(string pathToAssetsFile)
         {
             JObject assetsFile = JObject.Parse(File.ReadAllText(pathToAssetsFile));
-            return assetsFile["project"]?["frameworks"]?["net7.0"]?["frameworkReferences"]?["Microsoft.AspNetCore.App"] != null;
+            return assetsFile["project"]?["frameworks"]?[ScriptEnvironment.Default.TargetFramework]?["frameworkReferences"]?["Microsoft.AspNetCore.App"] != null;
         }
 
-
         private static string GetPathToProjectFile(string pathToAssetsFile)
         {
             var pathToProjectFile = Directory.GetFiles(Path.Combine(Path.GetDirectoryName(pathToAssetsFile), ".."), "*.csproj", SearchOption.TopDirectoryOnly).SingleOrDefault();
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -483,9 +483,11 @@ public void ShouldSetCurrentContextualReflectionContext()
         [Fact]
         public void ShouldCompileAndExecuteWithWebSdk()
         {
-            // var test = ScriptTestRunner.ExecuteFixtureInProcess("WebApi", "--no-cache --isolated-load-context");
-            var test = ScriptTestRunner.ExecuteFixtureInProcess("WebApi", "--no-cache --debug");
-            Assert.Equal(0, test);
+            var processResult = ScriptTestRunner.Default.ExecuteFixture("WebApi", "--no-cache");
+            Assert.Equal(0, processResult.ExitCode);
+
+            // var test = ScriptTestRunner.ExecuteFixtureInProcess("WebApi", "--no-cache --debug");
+            // Assert.Equal(0, test);
             // var (output, _) = ScriptTestRunner.Default.ExecuteFixture("CurrentContextualReflectionContext", "--isolated-load-context");
             // Assert.Contains("Dotnet.Script.Core.ScriptAssemblyLoadContext", output);
         }
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -26,7 +26,9 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-6.final" />
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Dotnet.Script.Core\Dotnet.Script.Core.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "7.0.100-rc.1.22431.12",`
	`3`	`+ "version": "7.0.100",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,9 @@ public ScriptDependencyContext ReadDependencyContext(string pathToAssetsFile)`
`87`	`87`	`private bool HasAspNetCoreFrameworkReference(string pathToAssetsFile)`
`88`	`88`	`{`
`89`	`89`	`JObject assetsFile = JObject.Parse(File.ReadAllText(pathToAssetsFile));`
`90`		`- return assetsFile["project"]?["frameworks"]?["net7.0"]?["frameworkReferences"]?["Microsoft.AspNetCore.App"] != null;`
	`90`	`+ return assetsFile["project"]?["frameworks"]?[ScriptEnvironment.Default.TargetFramework]?["frameworkReferences"]?["Microsoft.AspNetCore.App"] != null;`
`91`	`91`	`}`
`92`	`92`
`93`		`-`
`94`	`93`	`private static string GetPathToProjectFile(string pathToAssetsFile)`
`95`	`94`	`{`
`96`	`95`	`var pathToProjectFile = Directory.GetFiles(Path.Combine(Path.GetDirectoryName(pathToAssetsFile), ".."), "*.csproj", SearchOption.TopDirectoryOnly).SingleOrDefault();`