Skip to content

Commit d09506f

Browse files
StevenTCramerStevenTCramer
authored
Merge pull request #269 from TimeWarpEngineering/Cramer/2021-12-19/dotnet6
Adding in dotnet 6
2 parents 36330af + 80d7124 commit d09506f

9 files changed

Lines changed: 776 additions & 375 deletions

File tree

‎Assets/Logo.png‎

1.2 MB
Loading

‎Assets/Logo.svg‎

Lines changed: 594 additions & 149 deletions
Loading

‎Build/BlazorStateMultiStage.yml‎

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

66
variables:
77
Major: 4
8-
Minor: 0
9-
Patch: 1
10-
DotNetSdkVersion: 5.0.3
8+
Minor: 1
9+
Patch: 0
10+
Beta: "-beta.1" # "-beta.X" or ""
11+
DotNetSdkVersion: 6.0.101
1112

1213
stages:
1314
- stage: Test_Stage
@@ -133,7 +134,7 @@ stages:
133134
variables:
134135
# PatchCounterReset: $(Major).$(Minor)
135136
# Patch: $[counter(variables.PatchCounterReset, 0)]
136-
Version: '$(Major).$(Minor).$(Patch)+$(DotNetSdkVersion)'
137+
Version: '$(Major).$(Minor).$(Patch)$(Beta)+$(DotNetSdkVersion)'
137138
strategy:
138139
runOnce:
139140
deploy:

‎Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</PropertyGroup>
2424

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

3030
<!--Versions of packages used across the solution-->
@@ -42,9 +42,9 @@
4242
<MicrosoftExtensionsFileProvidersEmbeddedVersion>5.0.3</MicrosoftExtensionsFileProvidersEmbeddedVersion>
4343
<MicrosoftExtensionsLoggingAbstractionsVersion>5.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
4444

45-
<MicrosoftSourceLinkGitHubVersion>1.0.0</MicrosoftSourceLinkGitHubVersion>
45+
<MicrosoftSourceLinkGitHubVersion>1.1.1</MicrosoftSourceLinkGitHubVersion>
4646

47-
<AnyCloneVersion>1.0.39</AnyCloneVersion>
47+
<AnyCloneVersion>1.1.2</AnyCloneVersion>
4848
<BlazorExtensionsLoggingVersion>0.3.0</BlazorExtensionsLoggingVersion>
4949
<CoverletMsbuildVersion>3.0.3</CoverletMsbuildVersion>
5050
<FixieVersion>2.2.2</FixieVersion>

‎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)