Skip to content

Commit ab198c1

Browse files
TaritsynTaritsyn
committed
In test and sample projects added support of .NET 9
1 parent 35eefaa commit ab198c1

File tree

62 files changed

+2495
-26
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2495
-26
lines changed

‎JavaScriptEngineSwitcher.sln‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sa
128128
EndProject
129129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore8.Mvc8", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore8.Mvc8\JavaScriptEngineSwitcher.Sample.AspNetCore8.Mvc8.csproj", "{4E7BC7EF-5982-4A59-9283-05D158E637E2}"
130130
EndProject
131+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptEngineSwitcher.Sample.AspNetCore9.Mvc9", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore9.Mvc9\JavaScriptEngineSwitcher.Sample.AspNetCore9.Mvc9.csproj", "{E3EE2294-2E15-4537-BCFF-D69F17457A48}"
132+
EndProject
131133
Global
132134
GlobalSection(SolutionConfigurationPlatforms) = preSolution
133135
Debug|Any CPU = Debug|Any CPU
@@ -238,6 +240,10 @@ Global
238240
{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
239241
{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
240242
{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3}.Release|Any CPU.Build.0 = Release|Any CPU
243+
{98839644-D3CB-4CA0-A320-49286A7770B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
244+
{98839644-D3CB-4CA0-A320-49286A7770B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
245+
{98839644-D3CB-4CA0-A320-49286A7770B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
246+
{98839644-D3CB-4CA0-A320-49286A7770B5}.Release|Any CPU.Build.0 = Release|Any CPU
241247
{C790AD7F-55C6-4106-8D8C-8F901B7FF245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
242248
{C790AD7F-55C6-4106-8D8C-8F901B7FF245}.Debug|Any CPU.Build.0 = Debug|Any CPU
243249
{C790AD7F-55C6-4106-8D8C-8F901B7FF245}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -266,14 +272,14 @@ Global
266272
{923B1463-910F-4542-8E68-29F36A9DB508}.Debug|Any CPU.Build.0 = Debug|Any CPU
267273
{923B1463-910F-4542-8E68-29F36A9DB508}.Release|Any CPU.ActiveCfg = Release|Any CPU
268274
{923B1463-910F-4542-8E68-29F36A9DB508}.Release|Any CPU.Build.0 = Release|Any CPU
269-
{98839644-D3CB-4CA0-A320-49286A7770B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
270-
{98839644-D3CB-4CA0-A320-49286A7770B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
271-
{98839644-D3CB-4CA0-A320-49286A7770B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
272-
{98839644-D3CB-4CA0-A320-49286A7770B5}.Release|Any CPU.Build.0 = Release|Any CPU
273275
{4E7BC7EF-5982-4A59-9283-05D158E637E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
274276
{4E7BC7EF-5982-4A59-9283-05D158E637E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
275277
{4E7BC7EF-5982-4A59-9283-05D158E637E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
276278
{4E7BC7EF-5982-4A59-9283-05D158E637E2}.Release|Any CPU.Build.0 = Release|Any CPU
279+
{E3EE2294-2E15-4537-BCFF-D69F17457A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
280+
{E3EE2294-2E15-4537-BCFF-D69F17457A48}.Debug|Any CPU.Build.0 = Debug|Any CPU
281+
{E3EE2294-2E15-4537-BCFF-D69F17457A48}.Release|Any CPU.ActiveCfg = Release|Any CPU
282+
{E3EE2294-2E15-4537-BCFF-D69F17457A48}.Release|Any CPU.Build.0 = Release|Any CPU
277283
EndGlobalSection
278284
GlobalSection(SolutionProperties) = preSolution
279285
HideSolutionNode = FALSE
@@ -307,15 +313,16 @@ Global
307313
{62F0C0AD-15BC-42CE-9BD2-49F506FEAA54} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
308314
{C434E1B5-0463-4E58-8336-87F822D07B41} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
309315
{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
316+
{98839644-D3CB-4CA0-A320-49286A7770B5} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
310317
{C790AD7F-55C6-4106-8D8C-8F901B7FF245} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
311318
{5CA92021-B75A-40AF-B5AA-500BAF76B4D6} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
312319
{0342791E-6390-4F97-9163-5CE02E4CFF07} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
313320
{D0127B5A-E66B-4DA2-8C57-A8BA2A0163F4} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
314321
{189376C9-49DA-4A12-9C78-CE39E8EC7731} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
315322
{58321699-3715-4CA7-8036-A9F26E4C93F3} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
316323
{923B1463-910F-4542-8E68-29F36A9DB508} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
317-
{98839644-D3CB-4CA0-A320-49286A7770B5} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
318324
{4E7BC7EF-5982-4A59-9283-05D158E637E2} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
325+
{E3EE2294-2E15-4537-BCFF-D69F17457A48} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
319326
EndGlobalSection
320327
GlobalSection(ExtensibilityGlobals) = postSolution
321328
SolutionGuid = {8184BE59-ACBC-4CD1-9419-D59A0FAC6131}

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0.403"
3+
"version": "9.0.100"
44
}
55
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure/JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure.csproj‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
<PropertyGroup>
44
<Product>JS Engine Switcher: Infrastructure for ASP.NET Core Samples</Product>
55
<VersionPrefix>3.27.2</VersionPrefix>
6-
<TargetFrameworks>net451;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net451;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
77
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
88
<OutputType>Library</OutputType>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10+
<NoWarn>$(NoWarn);NETSDK1215;NU1902;NU1903;NU1904</NoWarn>
1011
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
1112
<IsPackable>false</IsPackable>
1213
<CheckEolTargetFramework>false</CheckEolTargetFramework>
@@ -33,15 +34,19 @@
3334
</ItemGroup>
3435

3536
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
36-
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="6.0.35" />
37+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="6.0.36" />
3738
</ItemGroup>
3839

3940
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
4041
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="7.0.20" />
4142
</ItemGroup>
4243

4344
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
44-
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="8.0.10" />
45+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="8.0.11" />
46+
</ItemGroup>
47+
48+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
49+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="9.0.0" />
4550
</ItemGroup>
4651

4752
</Project>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<RuntimeFrameworkVersion>1.0.16</RuntimeFrameworkVersion>
88
<OutputType>Exe</OutputType>
99
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
10-
<NoWarn>$(NoWarn);NU1903</NoWarn>
10+
<NoWarn>$(NoWarn);NU1903;NU1904</NoWarn>
1111
<PreserveCompilationContext>true</PreserveCompilationContext>
1212
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1313
<IsPackable>false</IsPackable>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<TargetFramework>net451</TargetFramework>
77
<OutputType>Exe</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<NoWarn>$(NoWarn);NU1903;NU1904</NoWarn>
910
<PreserveCompilationContext>true</PreserveCompilationContext>
1011
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1112
<IsPackable>false</IsPackable>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<TargetFramework>netcoreapp2.1</TargetFramework>
77
<OutputType>Exe</OutputType>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9-
<NoWarn>$(NoWarn);NU1902;NU1903</NoWarn>
9+
<NoWarn>$(NoWarn);NU1902;NU1903;NU1904</NoWarn>
10+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
1011
<PreserveCompilationContext>true</PreserveCompilationContext>
1112
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1213
<IsPackable>false</IsPackable>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore7.Mvc7/JavaScriptEngineSwitcher.Sample.AspNetCore7.Mvc7.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<PreserveCompilationContext>true</PreserveCompilationContext>
1111
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1212
<IsPackable>false</IsPackable>
13+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1314
</PropertyGroup>
1415

1516
<Import Project="../../build/common.props" />

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore9.Mvc9/.bowerrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"registry": "https://registry.bower.io",
3+
"directory": "wwwroot/lib"
4+
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore9.Mvc9/Controllers/HomeController.cs‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
using System.Diagnostics;
2+
using System.Threading.Tasks;
3+
4+
using Microsoft.AspNetCore.Hosting;
5+
using Microsoft.AspNetCore.Html;
6+
using Microsoft.AspNetCore.Mvc;
7+
using Microsoft.Extensions.Configuration;
8+
9+
using JavaScriptEngineSwitcher.Sample.AspNetCore9.Mvc9.Models;
10+
using JavaScriptEngineSwitcher.Sample.Logic.Models;
11+
using JavaScriptEngineSwitcher.Sample.Logic.Services;
12+
13+
namespace JavaScriptEngineSwitcher.Sample.AspNetCore9.Mvc9.Controllers
14+
{
15+
public class HomeController : Controller
16+
{
17+
private readonly FileContentService _fileContentService;
18+
private readonly JsEvaluationService _jsEvaluationService;
19+
20+
21+
public HomeController(
22+
IConfigurationRoot configuration,
23+
IWebHostEnvironment hostingEnvironment,
24+
JsEvaluationService jsEvaluationService)
25+
{
26+
string textContentDirectoryPath = configuration
27+
.GetSection("jsengineswitcher")
28+
.GetSection("Samples")["TextContentDirectoryPath"]
29+
;
30+
31+
_fileContentService = new FileContentService(textContentDirectoryPath, hostingEnvironment);
32+
_jsEvaluationService = jsEvaluationService;
33+
}
34+
35+
36+
[ResponseCache(CacheProfileName = "CacheCompressedContent5Minutes")]
37+
public IActionResult Index()
38+
{
39+
ViewBag.Body = new HtmlString(_fileContentService.GetFileContent("index.html"));
40+
41+
return View();
42+
}
43+
44+
[HttpGet]
45+
[ResponseCache(CacheProfileName = "CacheCompressedContent5Minutes")]
46+
public IActionResult Demo()
47+
{
48+
var model = _jsEvaluationService.GetInitializationData();
49+
50+
return View(model);
51+
}
52+
53+
[HttpPost]
54+
public async Task<IActionResult> Demo(JsEvaluationViewModel editedModel)
55+
{
56+
var model = _jsEvaluationService.GetInitializationData();
57+
await TryUpdateModelAsync(model, string.Empty, m => m.EngineName, m=> m.Expression);
58+
59+
if (ModelState.IsValid)
60+
{
61+
model = _jsEvaluationService.Evaluate(model);
62+
63+
ModelState.Clear();
64+
}
65+
66+
return View(model);
67+
}
68+
69+
[ResponseCache(CacheProfileName = "CacheCompressedContent5Minutes")]
70+
public IActionResult Contact()
71+
{
72+
ViewBag.Body = new HtmlString(_fileContentService.GetFileContent("contact.html"));
73+
74+
return View();
75+
}
76+
77+
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
78+
public IActionResult Error()
79+
{
80+
return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
81+
}
82+
}
83+
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore9.Mvc9/JavaScriptEngineSwitcher.Sample.AspNetCore9.Mvc9.csproj‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<Product>JS Engine Switcher: Sample ASP.NET Core 9.0 MVC 9 Site</Product>
5+
<VersionPrefix>3.27.2</VersionPrefix>
6+
<TargetFramework>net9.0</TargetFramework>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<OutputType>Exe</OutputType>
9+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10+
<PreserveCompilationContext>true</PreserveCompilationContext>
11+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
12+
<IsPackable>false</IsPackable>
13+
</PropertyGroup>
14+
15+
<Import Project="../../build/common.props" />
16+
17+
<ItemGroup>
18+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" />
19+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" />
20+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-arm" />
21+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-arm64" />
22+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x64" />
23+
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-x86" />
24+
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-arm" />
25+
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-arm64" />
26+
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-x64" />
27+
<PackageReference Include="Microsoft.ClearScript.V8.Native.osx-arm64" />
28+
<PackageReference Include="Microsoft.ClearScript.V8.Native.osx-x64" />
29+
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-arm64" />
30+
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-x64" />
31+
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-x86" />
32+
33+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj" />
34+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection.csproj" />
35+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jint/JavaScriptEngineSwitcher.Jint.csproj" />
36+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Jurassic/JavaScriptEngineSwitcher.Jurassic.csproj" />
37+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
38+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.NiL/JavaScriptEngineSwitcher.NiL.csproj" />
39+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Node/JavaScriptEngineSwitcher.Node.csproj" />
40+
<ProjectReference Include="../JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure/JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure.csproj" />
41+
<ProjectReference Include="../JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj" />
42+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.V8/JavaScriptEngineSwitcher.V8.csproj" />
43+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
44+
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Yantra/JavaScriptEngineSwitcher.Yantra.csproj" />
45+
</ItemGroup>
46+
47+
<Target Name="NodePackageInstallation" BeforeTargets="BeforeBuild;BeforeClean">
48+
<Exec Command="npm install" ConsoleToMsBuild="true" />
49+
</Target>
50+
<Target Name="BowerPackagesInstallation" AfterTargets="AfterBuild">
51+
<Exec Command="bower install" ConsoleToMsBuild="true" />
52+
</Target>
53+
<Target Name="GulpClean" AfterTargets="AfterClean">
54+
<Exec Command="gulp cleanBuildedAssets" ConsoleToMsBuild="true" />
55+
</Target>
56+
<Target Name="GulpBuild" AfterTargets="BowerPackagesInstallation">
57+
<Exec Command="gulp buildAssets" ConsoleToMsBuild="true" />
58+
</Target>
59+
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
60+
<Exec Command="npm install" />
61+
<Exec Command="bower install" />
62+
<Exec Command="gulp" />
63+
</Target>
64+
65+
</Project>

0 commit comments

Comments
 (0)