Skip to content

Commit abfc1cc

Browse files
StevenTCramerStevenTCramer
authored
Merge pull request #259 from TimeWarpEngineering/Cramer/2021-02-28/Dotnet5
Cramer/2021 02 28/dotnet5
2 parents 49569de + 5571a34 commit abfc1cc

39 files changed

Lines changed: 2490 additions & 1542 deletions

‎BlazorState.sln‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.Api", "Tests\TestAp
1717
EndProject
1818
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.Client.Integration.Tests", "Tests\Client.Integration.Tests\TestApp.Client.Integration.Tests.csproj", "{9F7FD8F4-C4B2-4EB4-819B-0DAB95620C24}"
1919
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.EndToEnd.Selenium.Tests", "Tests\EndToEnd.Selenium.Tests\TestApp.EndToEnd.Selenium.Tests.csproj", "{31B84505-71FB-4D89-9840-EB0B33F5FB59}"
21-
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.Server.Integration.Tests", "Tests\Server.Integration.Tests\TestApp.Server.Integration.Tests.csproj", "{37FFCA3B-6533-4262-8913-1E62EC0034CA}"
2321
EndProject
2422
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.Server", "Tests\TestApp\Server\TestApp.Server.csproj", "{26D026AD-762A-4EE9-AC1B-FCE1CF5767E9}"
@@ -74,12 +72,6 @@ Global
7472
{9F7FD8F4-C4B2-4EB4-819B-0DAB95620C24}.ReduxDevToolsEnabled|Any CPU.Build.0 = ReduxDevToolsEnabled|Any CPU
7573
{9F7FD8F4-C4B2-4EB4-819B-0DAB95620C24}.Release|Any CPU.ActiveCfg = Release|Any CPU
7674
{9F7FD8F4-C4B2-4EB4-819B-0DAB95620C24}.Release|Any CPU.Build.0 = Release|Any CPU
77-
{31B84505-71FB-4D89-9840-EB0B33F5FB59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78-
{31B84505-71FB-4D89-9840-EB0B33F5FB59}.Debug|Any CPU.Build.0 = Debug|Any CPU
79-
{31B84505-71FB-4D89-9840-EB0B33F5FB59}.ReduxDevToolsEnabled|Any CPU.ActiveCfg = ReduxDevToolsEnabled|Any CPU
80-
{31B84505-71FB-4D89-9840-EB0B33F5FB59}.ReduxDevToolsEnabled|Any CPU.Build.0 = ReduxDevToolsEnabled|Any CPU
81-
{31B84505-71FB-4D89-9840-EB0B33F5FB59}.Release|Any CPU.ActiveCfg = Release|Any CPU
82-
{31B84505-71FB-4D89-9840-EB0B33F5FB59}.Release|Any CPU.Build.0 = Release|Any CPU
8375
{37FFCA3B-6533-4262-8913-1E62EC0034CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8476
{37FFCA3B-6533-4262-8913-1E62EC0034CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
8577
{37FFCA3B-6533-4262-8913-1E62EC0034CA}.ReduxDevToolsEnabled|Any CPU.ActiveCfg = ReduxDevToolsEnabled|Any CPU
@@ -107,7 +99,6 @@ Global
10799
{50D398DD-1384-4FF3-9415-E46F5DC2E79F} = {2902FDFD-016E-4BF7-8B41-53D674FA53DD}
108100
{9C1235D1-6695-4A82-9FC3-3CA3257E5D7C} = {50D398DD-1384-4FF3-9415-E46F5DC2E79F}
109101
{9F7FD8F4-C4B2-4EB4-819B-0DAB95620C24} = {2902FDFD-016E-4BF7-8B41-53D674FA53DD}
110-
{31B84505-71FB-4D89-9840-EB0B33F5FB59} = {2902FDFD-016E-4BF7-8B41-53D674FA53DD}
111102
{37FFCA3B-6533-4262-8913-1E62EC0034CA} = {2902FDFD-016E-4BF7-8B41-53D674FA53DD}
112103
{26D026AD-762A-4EE9-AC1B-FCE1CF5767E9} = {50D398DD-1384-4FF3-9415-E46F5DC2E79F}
113104
{1F8DBDA6-780A-414E-8517-E96A1B9536E1} = {2902FDFD-016E-4BF7-8B41-53D674FA53DD}

‎Build/BlazorStateMultiStage.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ trigger:
44
pr: none
55

66
variables:
7-
Major: 3
8-
Minor: 4
9-
Patch: 4
10-
DotNetSdkVersion: 3.1.404
7+
Major: 4
8+
Minor: 0
9+
Patch: 0
10+
DotNetSdkVersion: 5.0.3
1111

1212
stages:
1313
- stage: Test_Stage

‎Directory.Build.props‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,40 +23,39 @@
2323
</PropertyGroup>
2424

2525
<PropertyGroup>
26-
<TargetFramework>netstandard2.1</TargetFramework>
27-
<TestProjectTargetFramework>netstandard2.1</TestProjectTargetFramework>
26+
<TargetFramework>net5.0</TargetFramework>
27+
<TestProjectTargetFramework>net5.0</TestProjectTargetFramework>
2828
</PropertyGroup>
2929

3030
<!--Versions of packages used across the solution-->
3131
<PropertyGroup Label="Package Versions">
32-
<MicrosoftAspNetCoreComponentsWebAssemblyVersion>3.2.1</MicrosoftAspNetCoreComponentsWebAssemblyVersion>
33-
<MicrosoftAspNetCoreComponentsWebAssemblyBuildVersion>3.2.1</MicrosoftAspNetCoreComponentsWebAssemblyBuildVersion>
34-
<MicrosoftAspNetCoreComponentsWebAssemblyDevServerVersion>3.2.1</MicrosoftAspNetCoreComponentsWebAssemblyDevServerVersion>
35-
<MicrosoftAspNetCoreComponentsWebAssemblyServerVersion>3.2.1</MicrosoftAspNetCoreComponentsWebAssemblyServerVersion>
36-
<SystemNetHttpJsonVersion>3.2.1</SystemNetHttpJsonVersion>
37-
<SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
38-
<SystemConfigurationConfigurationManagerVersion>4.7.0</SystemConfigurationConfigurationManagerVersion>
32+
<MicrosoftAspNetCoreComponentsWebAssemblyVersion>5.0.3</MicrosoftAspNetCoreComponentsWebAssemblyVersion>
33+
<MicrosoftAspNetCoreComponentsWebAssemblyDevServerVersion>5.0.3</MicrosoftAspNetCoreComponentsWebAssemblyDevServerVersion>
34+
<MicrosoftAspNetCoreComponentsWebAssemblyServerVersion>5.0.3</MicrosoftAspNetCoreComponentsWebAssemblyServerVersion>
35+
<SystemNetHttpJsonVersion>5.0.0</SystemNetHttpJsonVersion>
36+
<SystemTextJsonVersion>5.0.1</SystemTextJsonVersion>
37+
<SystemConfigurationConfigurationManagerVersion>5.0.0</SystemConfigurationConfigurationManagerVersion>
3938

40-
<MicrosoftAspNetCoreComponentsWebVersion>3.1.10</MicrosoftAspNetCoreComponentsWebVersion>
41-
<MicrosoftAspNetCoreMvcTestingVersion>3.1.10</MicrosoftAspNetCoreMvcTestingVersion>
42-
<MicrosoftAspNetCoreTestHostVersion>3.1.10</MicrosoftAspNetCoreTestHostVersion>
43-
<MicrosoftExtensionsFileProvidersEmbeddedVersion>3.1.10</MicrosoftExtensionsFileProvidersEmbeddedVersion>
44-
<MicrosoftExtensionsLoggingAbstractionsVersion>3.1.10</MicrosoftExtensionsLoggingAbstractionsVersion>
39+
<MicrosoftAspNetCoreComponentsWebVersion>5.0.3</MicrosoftAspNetCoreComponentsWebVersion>
40+
<MicrosoftAspNetCoreMvcTestingVersion>5.0.3</MicrosoftAspNetCoreMvcTestingVersion>
41+
<MicrosoftAspNetCoreTestHostVersion>5.0.3</MicrosoftAspNetCoreTestHostVersion>
42+
<MicrosoftExtensionsFileProvidersEmbeddedVersion>5.0.3</MicrosoftExtensionsFileProvidersEmbeddedVersion>
43+
<MicrosoftExtensionsLoggingAbstractionsVersion>5.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
4544

4645
<MicrosoftSourceLinkGitHubVersion>1.0.0</MicrosoftSourceLinkGitHubVersion>
4746

4847
<AnyCloneVersion>1.0.39</AnyCloneVersion>
4948
<BlazorExtensionsLoggingVersion>0.3.0</BlazorExtensionsLoggingVersion>
50-
<CoverletMsbuildVersion>2.9.0</CoverletMsbuildVersion>
49+
<CoverletMsbuildVersion>3.0.3</CoverletMsbuildVersion>
5150
<FixieVersion>2.2.2</FixieVersion>
5251
<FixieConsoleVersion>2.2.1</FixieConsoleVersion>
5352
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
5453
<MediatrExtensionsMicrosoftDependencyInjectionVersion>9.0.0</MediatrExtensionsMicrosoftDependencyInjectionVersion>
5554
<MediatrVersion>9.0.0</MediatrVersion>
56-
<ScrutorVersion>3.2.2</ScrutorVersion>
55+
<ScrutorVersion>3.3.0</ScrutorVersion>
5756
<SeleniumSupportVersion>3.141.0</SeleniumSupportVersion>
5857
<SeleniumWebDriverVersion>3.141.0</SeleniumWebDriverVersion>
59-
<ShouldlyVersion>3.0.2</ShouldlyVersion>
58+
<ShouldlyVersion>4.0.3</ShouldlyVersion>
6059
<TypeSupportVersion>1.1.4</TypeSupportVersion>
6160
</PropertyGroup>
6261

‎Source/BlazorState.Js/BlazorState.Js.csproj‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<OutputType>Library</OutputType>
5-
<IsPackable>false</IsPackable>
6-
<BlazorLinkOnBuild>false</BlazorLinkOnBuild>
7-
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
8-
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<IsPackable>false</IsPackable>
6+
<BlazorLinkOnBuild>false</BlazorLinkOnBuild>
7+
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
8+
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
99
<DefaultItemExcludes>${DefaultItemExcludes};node_modules\**</DefaultItemExcludes>
10-
<NoWarn>CS2008</NoWarn>
11-
12-
<!-- VS's FastUpToDateCheck doesn't consider .ts file changes, so it's necessary to disable it to get incremental builds to work correctly (albeit not as fast as if FastUpToDateCheck did work for them) -->
13-
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
14-
<Configurations>Debug;Release;ReduxDevToolsEnabled</Configurations>
15-
</PropertyGroup>
16-
17-
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedVersion)" />
19-
<WebpackInputs Include="**\*.ts" Exclude="node_modules\**" />
20-
</ItemGroup>
21-
22-
<ItemGroup>
23-
<WebpackInputs Remove="src\Constants.ts" />
24-
<WebpackInputs Remove="src\DotNet.ts" />
25-
</ItemGroup>
26-
27-
<Target Name="EnsureNpmRestored">
28-
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
29-
<Exec Command="npm install" />
30-
</Target>
31-
32-
<PropertyGroup>
33-
<JavascriptOutputFile>blazorstate.js</JavascriptOutputFile>
34-
</PropertyGroup>
35-
36-
<Target Name="RunWebpack" AfterTargets="ResolveReferences" Inputs="@(WebpackInputs)" Outputs="..\BlazorState\wwwroot\$(JavascriptOutputFile)" DependsOnTargets="EnsureNpmRestored">
37-
<Delete Files="..\BlazorState\wwwroot\$(JavascriptOutputFile)" />
38-
<Exec Command="npm run build" />
39-
</Target>
10+
<NoWarn>CS2008</NoWarn>
11+
12+
<!-- VS's FastUpToDateCheck doesn't consider .ts file changes, so it's necessary to disable it to get incremental builds to work correctly (albeit not as fast as if FastUpToDateCheck did work for them) -->
13+
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
14+
<Configurations>Debug;Release;ReduxDevToolsEnabled</Configurations>
15+
</PropertyGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedVersion)" />
19+
<WebpackInputs Include="**\*.ts" Exclude="node_modules\**" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<WebpackInputs Remove="src\Constants.ts" />
24+
<WebpackInputs Remove="src\DotNet.ts" />
25+
</ItemGroup>
26+
27+
<Target Name="EnsureNpmRestored">
28+
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
29+
<Exec Command="npm install" />
30+
</Target>
31+
32+
<PropertyGroup>
33+
<JavascriptOutputFile>blazorstate.js</JavascriptOutputFile>
34+
</PropertyGroup>
35+
36+
<Target Name="RunWebpack" AfterTargets="ResolveReferences" Inputs="@(WebpackInputs)" Outputs="..\BlazorState\wwwroot\$(JavascriptOutputFile)" DependsOnTargets="EnsureNpmRestored">
37+
<Delete Files="..\BlazorState\wwwroot\$(JavascriptOutputFile)" />
38+
<Exec Command="npm run build" />
39+
</Target>
4040
</Project>

0 commit comments

Comments
 (0)