Skip to content

Commit 3174755

Browse files
TaritsynTaritsyn
committed
In test and sample projects added support of .NET 6
1 parent 4fd8414 commit 3174755

File tree

90 files changed

+2452
-143
lines changed

Some content is hidden

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

90 files changed

+2452
-143
lines changed

‎JavaScriptEngineSwitcher.sln

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29613.14
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31912.275
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{19575E10-6B8E-4CF0-B7D2-898FFF47E157}"
77
ProjectSection(SolutionItems) = preProject
@@ -112,7 +112,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sa
112112
EndProject
113113
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31\JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31.csproj", "{D0127B5A-E66B-4DA2-8C57-A8BA2A0163F4}"
114114
EndProject
115-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5\JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5.csproj", "{189376C9-49DA-4A12-9C78-CE39E8EC7731}"
115+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5\JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5.csproj", "{189376C9-49DA-4A12-9C78-CE39E8EC7731}"
116+
EndProject
117+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptEngineSwitcher.Sample.AspNetCore6.Mvc6", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore6.Mvc6\JavaScriptEngineSwitcher.Sample.AspNetCore6.Mvc6.csproj", "{58321699-3715-4CA7-8036-A9F26E4C93F3}"
116118
EndProject
117119
Global
118120
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -240,6 +242,10 @@ Global
240242
{189376C9-49DA-4A12-9C78-CE39E8EC7731}.Debug|Any CPU.Build.0 = Debug|Any CPU
241243
{189376C9-49DA-4A12-9C78-CE39E8EC7731}.Release|Any CPU.ActiveCfg = Release|Any CPU
242244
{189376C9-49DA-4A12-9C78-CE39E8EC7731}.Release|Any CPU.Build.0 = Release|Any CPU
245+
{58321699-3715-4CA7-8036-A9F26E4C93F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
246+
{58321699-3715-4CA7-8036-A9F26E4C93F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
247+
{58321699-3715-4CA7-8036-A9F26E4C93F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
248+
{58321699-3715-4CA7-8036-A9F26E4C93F3}.Release|Any CPU.Build.0 = Release|Any CPU
243249
EndGlobalSection
244250
GlobalSection(SolutionProperties) = preSolution
245251
HideSolutionNode = FALSE
@@ -277,6 +283,7 @@ Global
277283
{0342791E-6390-4F97-9163-5CE02E4CFF07} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
278284
{D0127B5A-E66B-4DA2-8C57-A8BA2A0163F4} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
279285
{189376C9-49DA-4A12-9C78-CE39E8EC7731} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
286+
{58321699-3715-4CA7-8036-A9F26E4C93F3} = {E5989CB5-AACE-4D35-A8EE-26942F140DA3}
280287
EndGlobalSection
281288
GlobalSection(ExtensibilityGlobals) = postSolution
282289
SolutionGuid = {8184BE59-ACBC-4CD1-9419-D59A0FAC6131}

‎build/common.props

-12
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,4 @@
44
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
55
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
66
</PropertyGroup>
7-
8-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40-client' Or '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net471' ">
9-
<DefineConstants>$(DefineConstants);NETFULL</DefineConstants>
10-
</PropertyGroup>
11-
12-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'netstandard1.6' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1' ">
13-
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
14-
</PropertyGroup>
15-
16-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' Or '$(TargetFramework)' == 'netcoreapp2.0' Or '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' ">
17-
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
18-
</PropertyGroup>
197
</Project>

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "5.0.402"
3+
"version": "6.0.100"
44
}
55
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/Views/Shared/_Layout.cshtml

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<li><a href="http://www.facebook.com/taritsyn" target="_blank" class="icon icon-32 icon-facebook">Facebook</a></li>
5858
<li><a href="http://twitter.com/andrey_taritsyn" target="_blank" class="icon icon-32 icon-twitter">Twitter</a></li>
5959
<li><a href="http://www.linkedin.com/in/taritsyn" target="_blank" class="icon icon-32 icon-linkedin">LinkedIn</a></li>
60-
<li><a href="http://plus.google.com/104102250252560157369" target="_blank" class="icon icon-32 icon-google-plus">Google plus</a></li>
6160
</ul>
6261
</div>
6362
</div>

‎samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/styles/icons.less

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
background-position: 0 -64px;
2828
}
2929

30-
.icon-google-plus {
31-
background-position: 0 -96px;
32-
}
33-
3430
.icon-rss {
3531
background-position: 0 -128px;
3632
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/Views/Shared/_Layout.cshtml

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<li><a href="http://www.facebook.com/taritsyn" target="_blank" class="icon icon-32 icon-facebook">Facebook</a></li>
6565
<li><a href="http://twitter.com/andrey_taritsyn" target="_blank" class="icon icon-32 icon-twitter">Twitter</a></li>
6666
<li><a href="http://www.linkedin.com/in/taritsyn" target="_blank" class="icon icon-32 icon-linkedin">LinkedIn</a></li>
67-
<li><a href="http://plus.google.com/104102250252560157369" target="_blank" class="icon icon-32 icon-google-plus">Google plus</a></li>
6867
</ul>
6968
</div>
7069
</div>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/wwwroot/styles/icons.less

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
background-position: 0 -64px;
2828
}
2929

30-
.icon-google-plus {
31-
background-position: 0 -96px;
32-
}
33-
3430
.icon-rss {
3531
background-position: 0 -128px;
3632
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/Views/Shared/_Layout.cshtml

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<li><a href="http://www.facebook.com/taritsyn" target="_blank" class="icon icon-32 icon-facebook">Facebook</a></li>
6565
<li><a href="http://twitter.com/andrey_taritsyn" target="_blank" class="icon icon-32 icon-twitter">Twitter</a></li>
6666
<li><a href="http://www.linkedin.com/in/taritsyn" target="_blank" class="icon icon-32 icon-linkedin">LinkedIn</a></li>
67-
<li><a href="http://plus.google.com/104102250252560157369" target="_blank" class="icon icon-32 icon-google-plus">Google plus</a></li>
6867
</ul>
6968
</div>
7069
</div>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/wwwroot/styles/icons.less

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
background-position: 0 -64px;
2828
}
2929

30-
.icon-google-plus {
31-
background-position: 0 -96px;
32-
}
33-
3430
.icon-rss {
3531
background-position: 0 -128px;
3632
}

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

-12
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.AspNetCore.App" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
19-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
22-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.10" PrivateAssets="All" />
2317
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" Version="3.12.6" />
2418
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.12.6" />
2519
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-arm" Version="3.12.6" />
@@ -38,12 +32,6 @@
3832
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
3933
</ItemGroup>
4034

41-
<ItemGroup>
42-
<None Update="wwwroot/**/*;Views/**/*">
43-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
44-
</None>
45-
</ItemGroup>
46-
4735
<Target Name="NodePackageInstallation" BeforeTargets="BeforeBuild;BeforeClean">
4836
<Exec Command="npm install" ConsoleToMsBuild="true" />
4937
</Target>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/Startup.cs

-3
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,9 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
112112
else
113113
{
114114
app.UseExceptionHandler("/Home/Error");
115-
app.UseHsts();
116115
}
117116

118-
app.UseHttpsRedirection();
119117
app.UseStaticFiles();
120-
app.UseCookiePolicy();
121118

122119
app.UseMvc(routes =>
123120
{

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/Views/Shared/_Layout.cshtml

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<li><a href="http://www.facebook.com/taritsyn" target="_blank" class="icon icon-32 icon-facebook">Facebook</a></li>
6565
<li><a href="http://twitter.com/andrey_taritsyn" target="_blank" class="icon icon-32 icon-twitter">Twitter</a></li>
6666
<li><a href="http://www.linkedin.com/in/taritsyn" target="_blank" class="icon icon-32 icon-linkedin">LinkedIn</a></li>
67-
<li><a href="http://plus.google.com/104102250252560157369" target="_blank" class="icon icon-32 icon-google-plus">Google plus</a></li>
6867
</ul>
6968
</div>
7069
</div>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/wwwroot/styles/icons.less

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
background-position: 0 -64px;
2828
}
2929

30-
.icon-google-plus {
31-
background-position: 0 -96px;
32-
}
33-
3430
.icon-rss {
3531
background-position: 0 -128px;
3632
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31.csproj

-12
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
<Import Project="../../build/common.props" />
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.17" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.17" />
18-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.17" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.17" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.17" />
21-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.5" PrivateAssets="All" />
2216
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" Version="3.12.6" />
2317
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.12.6" />
2418
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-arm" Version="3.12.6" />
@@ -46,12 +40,6 @@
4640
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
4741
</ItemGroup>
4842

49-
<ItemGroup>
50-
<None Update="wwwroot/**/*;Views/**/*">
51-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
52-
</None>
53-
</ItemGroup>
54-
5543
<Target Name="NodePackageInstallation" BeforeTargets="BeforeBuild;BeforeClean">
5644
<Exec Command="npm install" ConsoleToMsBuild="true" />
5745
</Target>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31/Properties/launchSettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"anonymousAuthentication": true,
55
"iisExpress": {
66
"applicationUrl": "http://localhost:43491",
7-
"sslPort": 44373
7+
"sslPort": 0
88
}
99
},
1010
"profiles": {

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31/Startup.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
105105
else
106106
{
107107
app.UseExceptionHandler("/Home/Error");
108-
app.UseHsts();
109108
}
110109

111-
app.UseHttpsRedirection();
112110
app.UseStaticFiles();
113111

114112
app.UseRouting();
113+
115114
app.UseEndpoints(endpoints =>
116115
{
117116
endpoints.MapControllerRoute(

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31/Views/Shared/_Layout.cshtml

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<li><a href="http://www.facebook.com/taritsyn" target="_blank" class="icon icon-32 icon-facebook">Facebook</a></li>
6565
<li><a href="http://twitter.com/andrey_taritsyn" target="_blank" class="icon icon-32 icon-twitter">Twitter</a></li>
6666
<li><a href="http://www.linkedin.com/in/taritsyn" target="_blank" class="icon icon-32 icon-linkedin">LinkedIn</a></li>
67-
<li><a href="http://plus.google.com/104102250252560157369" target="_blank" class="icon icon-32 icon-google-plus">Google plus</a></li>
6867
</ul>
6968
</div>
7069
</div>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore31.Mvc31/wwwroot/styles/icons.less

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
background-position: 0 -64px;
2828
}
2929

30-
.icon-google-plus {
31-
background-position: 0 -96px;
32-
}
33-
3430
.icon-rss {
3531
background-position: 0 -128px;
3632
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5.csproj

+1-12
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
<Import Project="../../build/common.props" />
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
21-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" PrivateAssets="All" />
2216
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.linux-x64" Version="3.12.6" />
2317
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64" Version="3.12.6" />
2418
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore.Native.win-arm" Version="3.12.6" />
@@ -46,12 +40,6 @@
4640
<ProjectReference Include="../../src/JavaScriptEngineSwitcher.Vroom/JavaScriptEngineSwitcher.Vroom.csproj" />
4741
</ItemGroup>
4842

49-
<ItemGroup>
50-
<None Update="wwwroot/**/*;Views/**/*">
51-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
52-
</None>
53-
</ItemGroup>
54-
5543
<Target Name="NodePackageInstallation" BeforeTargets="BeforeBuild;BeforeClean">
5644
<Exec Command="npm install" ConsoleToMsBuild="true" />
5745
</Target>
@@ -69,4 +57,5 @@
6957
<Exec Command="bower install" />
7058
<Exec Command="gulp" />
7159
</Target>
60+
7261
</Project>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/Properties/launchSettings.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"anonymousAuthentication": true,
55
"iisExpress": {
66
"applicationUrl": "http://localhost:52873",
7-
"sslPort": 44341
7+
"sslPort": 0
88
}
99
},
1010
"profiles": {
@@ -19,7 +19,7 @@
1919
"commandName": "Project",
2020
"dotnetRunMessages": "true",
2121
"launchBrowser": true,
22-
"applicationUrl": "https://localhost:5001;http://localhost:5000",
22+
"applicationUrl": "http://localhost:5000",
2323
"environmentVariables": {
2424
"ASPNETCORE_ENVIRONMENT": "Development"
2525
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/Startup.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
105105
else
106106
{
107107
app.UseExceptionHandler("/Home/Error");
108-
app.UseHsts();
109108
}
110109

111-
app.UseHttpsRedirection();
112110
app.UseStaticFiles();
113111

114112
app.UseRouting();
113+
115114
app.UseEndpoints(endpoints =>
116115
{
117116
endpoints.MapControllerRoute(

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/Views/Shared/_Layout.cshtml

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<li><a href="http://www.facebook.com/taritsyn" target="_blank" class="icon icon-32 icon-facebook">Facebook</a></li>
6565
<li><a href="http://twitter.com/andrey_taritsyn" target="_blank" class="icon icon-32 icon-twitter">Twitter</a></li>
6666
<li><a href="http://www.linkedin.com/in/taritsyn" target="_blank" class="icon icon-32 icon-linkedin">LinkedIn</a></li>
67-
<li><a href="http://plus.google.com/104102250252560157369" target="_blank" class="icon icon-32 icon-google-plus">Google plus</a></li>
6867
</ul>
6968
</div>
7069
</div>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore5.Mvc5/wwwroot/styles/icons.less

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
background-position: 0 -64px;
2828
}
2929

30-
.icon-google-plus {
31-
background-position: 0 -96px;
32-
}
33-
3430
.icon-rss {
3531
background-position: 0 -128px;
3632
}

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore6.Mvc6/.bowerrc

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

0 commit comments

Comments
 (0)