Skip to content

Commit b447aee

Browse files
TaritsynTaritsyn
committed
In test and sample projects added support of .NET 8
1 parent dc7bb54 commit b447aee

File tree

102 files changed

+2437
-695
lines changed

Some content is hidden

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

102 files changed

+2437
-695
lines changed

‎JavaScriptEngineSwitcher.sln‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sa
110110
EndProject
111111
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4", "samples\JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4\JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj", "{8124DF18-4A0B-4648-8B90-4A6D3E4EF2F3}"
112112
EndProject
113+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure\JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure.csproj", "{98839644-D3CB-4CA0-A320-49286A7770B5}"
114+
EndProject
113115
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1\JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj", "{C790AD7F-55C6-4106-8D8C-8F901B7FF245}"
114116
EndProject
115117
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1\JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj", "{5CA92021-B75A-40AF-B5AA-500BAF76B4D6}"
@@ -124,6 +126,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sa
124126
EndProject
125127
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore7.Mvc7", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore7.Mvc7\JavaScriptEngineSwitcher.Sample.AspNetCore7.Mvc7.csproj", "{923B1463-910F-4542-8E68-29F36A9DB508}"
126128
EndProject
129+
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}"
130+
EndProject
127131
Global
128132
GlobalSection(SolutionConfigurationPlatforms) = preSolution
129133
Debug|Any CPU = Debug|Any CPU
@@ -210,6 +214,10 @@ Global
210214
{89F9DDDD-5236-4D9A-99E4-3C1358B81149}.Debug|Any CPU.Build.0 = Debug|Any CPU
211215
{89F9DDDD-5236-4D9A-99E4-3C1358B81149}.Release|Any CPU.ActiveCfg = Release|Any CPU
212216
{89F9DDDD-5236-4D9A-99E4-3C1358B81149}.Release|Any CPU.Build.0 = Release|Any CPU
217+
{897E4EFA-C8F5-4980-BBD0-2EA7B920B2EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
218+
{897E4EFA-C8F5-4980-BBD0-2EA7B920B2EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
219+
{897E4EFA-C8F5-4980-BBD0-2EA7B920B2EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
220+
{897E4EFA-C8F5-4980-BBD0-2EA7B920B2EB}.Release|Any CPU.Build.0 = Release|Any CPU
213221
{24A8F6A6-EA4E-43A6-A2D7-E1916F8CB4EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
214222
{24A8F6A6-EA4E-43A6-A2D7-E1916F8CB4EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
215223
{24A8F6A6-EA4E-43A6-A2D7-E1916F8CB4EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -258,10 +266,14 @@ Global
258266
{923B1463-910F-4542-8E68-29F36A9DB508}.Debug|Any CPU.Build.0 = Debug|Any CPU
259267
{923B1463-910F-4542-8E68-29F36A9DB508}.Release|Any CPU.ActiveCfg = Release|Any CPU
260268
{923B1463-910F-4542-8E68-29F36A9DB508}.Release|Any CPU.Build.0 = Release|Any CPU
261-
{897E4EFA-C8F5-4980-BBD0-2EA7B920B2EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
262-
{897E4EFA-C8F5-4980-BBD0-2EA7B920B2EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
263-
{897E4EFA-C8F5-4980-BBD0-2EA7B920B2EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
264-
{897E4EFA-C8F5-4980-BBD0-2EA7B920B2EB}.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
273+
{4E7BC7EF-5982-4A59-9283-05D158E637E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
274+
{4E7BC7EF-5982-4A59-9283-05D158E637E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
275+
{4E7BC7EF-5982-4A59-9283-05D158E637E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
276+
{4E7BC7EF-5982-4A59-9283-05D158E637E2}.Release|Any CPU.Build.0 = Release|Any CPU
265277
EndGlobalSection
266278
GlobalSection(SolutionProperties) = preSolution
267279
HideSolutionNode = FALSE
@@ -289,6 +301,7 @@ Global
289301
{238D7E69-7052-4DFC-83EF-79D3D124C12B} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
290302
{F0BF7975-2E8A-4EC8-8DAA-760A4302F419} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
291303
{89F9DDDD-5236-4D9A-99E4-3C1358B81149} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
304+
{897E4EFA-C8F5-4980-BBD0-2EA7B920B2EB} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
292305
{24A8F6A6-EA4E-43A6-A2D7-E1916F8CB4EE} = {53B43213-2E66-42C2-8476-600A2FD2DA75}
293306
{E95FDEF6-18A0-4E26-8FDF-B4B590E6EDAF} = {53B43213-2E66-42C2-8476-600A2FD2DA75}
294307
{62F0C0AD-15BC-42CE-9BD2-49F506FEAA54} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
@@ -301,7 +314,8 @@ Global
301314
{189376C9-49DA-4A12-9C78-CE39E8EC7731} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
302315
{58321699-3715-4CA7-8036-A9F26E4C93F3} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
303316
{923B1463-910F-4542-8E68-29F36A9DB508} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
304-
{897E4EFA-C8F5-4980-BBD0-2EA7B920B2EB} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
317+
{98839644-D3CB-4CA0-A320-49286A7770B5} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
318+
{4E7BC7EF-5982-4A59-9283-05D158E637E2} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
305319
EndGlobalSection
306320
GlobalSection(ExtensibilityGlobals) = postSolution
307321
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": "7.0.403"
3+
"version": "8.0.100"
44
}
55
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Infrastructure/Helpers/CommonExtensions.cs‎ renamed to ‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure/Helpers/CommonExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.AspNetCore.Html;
44
using Microsoft.AspNetCore.Mvc.Rendering;
55

6-
namespace JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.Infrastructure.Helpers
6+
namespace JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure.Helpers
77
{
88
public static class CommonExtensions
99
{

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Product>JS Engine Switcher: Infrastructure for ASP.NET Core Samples</Product>
5+
<VersionPrefix>3.23.4</VersionPrefix>
6+
<TargetFrameworks>net451;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
7+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
8+
<OutputType>Library</OutputType>
9+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10+
<IsPackable>false</IsPackable>
11+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
12+
</PropertyGroup>
13+
14+
<Import Project="../../build/common.props" />
15+
16+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' Or '$(TargetFramework)' == 'net451' ">
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.0.6" />
18+
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="1.0.6" />
19+
</ItemGroup>
20+
21+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
22+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.38" />
23+
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.1.3" />
24+
</ItemGroup>
25+
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
27+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="3.1.32" />
28+
</ItemGroup>
29+
30+
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
31+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="5.0.17" />
32+
</ItemGroup>
33+
34+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
35+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="6.0.25" />
36+
</ItemGroup>
37+
38+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
39+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="7.0.14" />
40+
</ItemGroup>
41+
42+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
43+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="8.0.0" />
44+
</ItemGroup>
45+
46+
</Project>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/Infrastructure/TagHelpers/ConditionalCommentTagHelper.cs‎ renamed to ‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure/TagHelpers/ConditionalCommentTagHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
using Microsoft.AspNetCore.Razor.TagHelpers;
44

5-
namespace JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5.Infrastructure.TagHelpers
5+
namespace JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure.TagHelpers
66
{
77
[HtmlTargetElement("conditional-comment")]
88
public class ConditionalCommentTagHelper : TagHelper

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/Infrastructure/TagHelpers/ConditionalCommentType.cs‎ renamed to ‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure/TagHelpers/ConditionalCommentType.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5.Infrastructure.TagHelpers
1+
namespace JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure.TagHelpers
22
{
33
public enum ConditionalCommentType
44
{

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Infrastructure/TagHelpers/ConditionalCommentTagHelper.cs‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Infrastructure/TagHelpers/ConditionalCommentType.cs‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<RuntimeFrameworkVersion>1.0.16</RuntimeFrameworkVersion>
88
<OutputType>Exe</OutputType>
99
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
10+
<NoWarn>$(NoWarn);NU1903</NoWarn>
1011
<PreserveCompilationContext>true</PreserveCompilationContext>
1112
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1213
<IsPackable>false</IsPackable>
@@ -38,6 +39,7 @@
3839
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj" />
3940
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection/JavaScriptEngineSwitcher.Extensions.MsDependencyInjection.csproj" />
4041
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj" />
42+
<ProjectReference Include="../JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure/JavaScriptEngineSwitcher.Sample.AspNetCore.Infrastructure.csproj" />
4143
<ProjectReference Include="../JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj" />
4244
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
4345
</ItemGroup>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Properties/launchSettings.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
}
99
},
1010
"profiles": {
11-
"IIS Express": {
12-
"commandName": "IISExpress",
13-
"launchBrowser": true,
14-
"environmentVariables": {
15-
"ASPNETCORE_ENVIRONMENT": "Development"
16-
}
17-
},
1811
"JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1": {
1912
"commandName": "Project",
2013
"launchBrowser": true,
2114
"environmentVariables": {
2215
"ASPNETCORE_ENVIRONMENT": "Development"
2316
},
2417
"applicationUrl": "http://localhost:15465/"
18+
},
19+
"IIS Express": {
20+
"commandName": "IISExpress",
21+
"launchBrowser": true,
22+
"environmentVariables": {
23+
"ASPNETCORE_ENVIRONMENT": "Development"
24+
}
2525
}
2626
}
2727
}

0 commit comments

Comments
 (0)