Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/blazor #72

Merged
merged 7 commits into from
Sep 11, 2020
Merged

Feature/blazor #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
63b2a78
Added blazor packages and worked on server side blazor solution
david-driscoll Aug 31, 2020
4769b6c
Updated readme
david-driscoll Aug 31, 2020
99a9298
Updated blazor branch with latest (mostly works)
david-driscoll Sep 7, 2020
97a4f68
blazor wasm wip
david-driscoll Sep 9, 2020
1993a46
Shuffeled some pieces around, added helper method to support conventi…
david-driscoll Sep 10, 2020
ad82190
Updated to latest
david-driscoll Sep 11, 2020
d9aa470
merged with latest
david-driscoll Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 38 additions & 15 deletions .build/Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
[MSBuildVerbosityMapping]
[NuGetVerbosityMapping]
public partial class Solution : NukeBuild,
ICanRestoreWithDotNetCore,
ICanBuildWithDotNetCore,
ICanTestWithDotNetCore,
ICanPackWithDotNetCore,
IHaveDataCollector,
ICanClean,
ICanUpdateReadme,
IGenerateCodeCoverageReport,
IGenerateCodeCoverageSummary,
IGenerateCodeCoverageBadges,
IHaveConfiguration<Configuration>,
ICanLint
ICanRestoreWithDotNetCore,
ICanBuildWithDotNetCore,
ICanTestWithDotNetCore,
IHaveNuGetPackages,
IHaveDataCollector,
ICanClean,
ICanUpdateReadme,
IGenerateCodeCoverageReport,
IGenerateCodeCoverageSummary,
IGenerateCodeCoverageBadges,
IHaveConfiguration<Configuration>,
ICanLint
{
/// <summary>
/// Support plugins are available for:
Expand All @@ -51,8 +51,31 @@ public partial class Solution : NukeBuild,

public Target Build => _ => _.Inherit<ICanBuildWithDotNetCore>(x => x.CoreBuild);

public Target Pack => _ => _.Inherit<ICanPackWithDotNetCore>(x => x.CorePack)
.DependsOn(Clean);
// public Target Pack => _ => _.Inherit<ICanPackWithDotNetCore>(x => x.CorePack)
// .DependsOn(Clean);

/// <summary>
/// dotnet pack
/// </summary>
public Target Pack => _ => _
.Description("Packs all the NuGet packages.")
.DependsOn(Clean)
.After(Test)
.Executes(
() =>
{
IHaveSolution selfSolution = this;
IHaveNuGetPackages nuget = this;
IHaveOutputLogs logs = this;
return DotNetTasks.DotNetPack(
s => s.SetProject(selfSolution.Solution)
.SetDefaultLoggers(logs.LogsDirectory / "pack.log")
.SetGitVersionEnvironment(GitVersion)
.SetConfiguration(Configuration)
.SetOutputDirectory(nuget.NuGetPackageDirectory)
);
}
);

[ComputedGitVersion]
public GitVersion GitVersion { get; } = null!;
Expand All @@ -67,4 +90,4 @@ public partial class Solution : NukeBuild,

[Parameter("Configuration to build")]
public Configuration Configuration { get; } = IsLocalBuild ? Configuration.Debug : Configuration.Release;
}
}
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,4 @@ src/Cake.Scripts/tools/tools/
codealike.json

# Rider
.idea/
global.json
.idea/
60 changes: 37 additions & 23 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
<PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2020.2.2"/>
<PackageVersion Include="Nuke.Common" Version="0.25.0-alpha0334"/>
<PackageVersion Include="ReportGenerator" Version="4.6.7"/>
<PackageVersion Include="Rocket.Surgery.Nuke" Version="0.14.0-beta.9"/>
<PackageVersion Include="Rocket.Surgery.Nuke" Version="0.14.0-beta.10"/>
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Newtonsoft.Json" Version="12.0.3"/>
</ItemGroup>
<ItemGroup>
<PackageVersion Include="App.Metrics" Version="4.1.0"/>
Expand All @@ -31,45 +34,53 @@
<PackageVersion Include="FluentValidation.AspNetCore" Version="9.2.0"/>
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="9.2.0"/>
<PackageVersion Include="Grpc.AspNetCore" Version="2.31.0"/>
<PackageVersion Include="Humanizer.Core" Version="2.8.26"/>
<PackageVersion Include="Hellang.Middleware.ProblemDetails" Version="5.1.1"/>
<PackageVersion Include="MediatR" Version="8.1.0"/>
<PackageVersion Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.1.0"/>
<!-- <PackageVersion Include="MicroElements.Swashbuckle.FluentValidation" Version="4.0.0-rc.2" />-->
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7"/>
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8"/>
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.7"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="3.1.7"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="3.1.8"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="3.1.8"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all"/>
<PackageVersion Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0"/>
<PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="3.0.9"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.7"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="3.1.7"/>
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="3.1.7"/>
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="3.1.7"/>
<PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.7"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.7"/>
<PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.7"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.8"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="3.1.8"/>
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="3.1.8"/>
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="3.1.8"/>
<PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.8"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8"/>
<PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.8"/>
<PackageVersion Include="Microsoft.Reactive.Testing" Version="4.4.1"/>
<!-- <PackageVersion Include="Newtonsoft.Json" Version="12.0.3"/>-->
<!-- <PackageVersion Include="Newtonsoft.Json" Version="12.0.3" />-->
<PackageVersion Include="NodaTime" Version="3.0.0"/>
<PackageVersion Include="NodaTime.Serialization.JsonNet" Version="3.0.0"/>
<PackageVersion Include="NodaTime.Serialization.SystemTextJson" Version="1.0.0"/>
<PackageVersion Include="NodaTime.Testing" Version="3.0.0"/>
<PackageVersion Include="Rocket.Surgery.Build.Information" Version="3.3.11"/>
<PackageVersion Include="Rocket.Surgery.Conventions" Version="10.0.0-beta.13"/>
<PackageVersion Include="Rocket.Surgery.Conventions.Abstractions" Version="10.0.0-beta.13"/>
<PackageVersion Include="Rocket.Surgery.Conventions.Attributes" Version="10.0.0-beta.13"/>
<PackageVersion Include="Rocket.Surgery.Conventions.AutoMapper" Version="8.0.0-beta.3"/>
<PackageVersion Include="Rocket.Surgery.Conventions.TestHost" Version="10.0.0-beta.13"/>
<PackageVersion Include="Rocket.Surgery.Extensions.Configuration" Version="10.0.0-beta.13"/>
<PackageVersion Include="Rocket.Surgery.Extensions.Configuration.Json" Version="10.0.0-beta.13"/>
<PackageVersion Include="Rocket.Surgery.Extensions.Configuration.Yaml" Version="10.0.0-beta.13"/>
<PackageVersion Include="Rocket.Surgery.Conventions" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.Conventions.Abstractions" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.Conventions.Attributes" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.Extensions.AutoMapper.NodaTime" Version="8.0.0-beta.7"/>
<PackageVersion Include="Rocket.Surgery.Extensions.AutoMapper.SystemTextJson" Version="8.0.0-beta.7"/>
<PackageVersion Include="Rocket.Surgery.Extensions.AutoMapper.NewtonsoftJson" Version="8.0.0-beta.7"/>
<PackageVersion Include="Rocket.Surgery.Conventions.AutoMapper" Version="8.0.0-beta.7"/>
<PackageVersion Include="Rocket.Surgery.Hosting.TestHost" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.Extensions.Configuration" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.Extensions.Configuration.Json" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.Extensions.Configuration.Yaml" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.DependencyInjection.Extensions" Version="2.5.0"/>
<PackageVersion Include="Rocket.Surgery.Extensions" Version="2.5.0"/>
<PackageVersion Include="Rocket.Surgery.Hosting.DryIoc" Version="0.2.0-tags-v0-1-0-beta-3.1"/>
<PackageVersion Include="Rocket.Surgery.Hosting" Version="10.0.0-beta.13"/>
<PackageVersion Include="Rocket.Surgery.Hosting.Abstractions" Version="10.0.0-beta.13"/>
<PackageVersion Include="Rocket.Surgery.Hosting.DryIoc" Version="0.2.0-beta.3"/>
<PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting.DryIoc" Version="0.2.0-beta.3"/>
<PackageVersion Include="Rocket.Surgery.Hosting" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.Hosting.Abstractions" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting.TestHost" Version="10.0.0-beta.22"/>
<PackageVersion Include="Rocket.Surgery.System" Version="2.5.0"/>
<PackageVersion Include="Scrutor" Version="3.2.2"/>
<PackageVersion Include="Serilog" Version="2.10.0"/>
Expand All @@ -87,14 +98,17 @@
<PackageVersion Include="Serilog.Sinks.Observable" Version="2.0.2"/>
<PackageVersion Include="Swashbuckle.AspNetCore" Version="5.5.1"/>
<PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="5.5.1"/>
<PackageVersion Include="SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime" Version="1.3.0"/>
<PackageVersion Include="SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime" Version="1.3.1"/>
<PackageVersion Include="System.Collections.Immutable" Version="1.7.1"/>
<PackageVersion Include="System.Interactive" Version="4.1.1"/>
<PackageVersion Include="System.Interactive.Async" Version="4.1.1"/>
<PackageVersion Include="System.Reactive" Version="4.4.1"/>
<PackageVersion Include="System.Reactive.Observable.Aliases" Version="4.4.1"/>
<PackageVersion Include="System.Text.Json" Version="4.7.2"/>
<PackageVersion Include="System.Net.Http.Json" Version="3.2.1"/>
<PackageVersion Include="NSwag.ApiDescription.Client" Version="13.7.0"/>
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Client" Version="3.1.8"/>
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="3.1.8"/>
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Bogus" Version="30.0.4"/>
Expand Down
51 changes: 23 additions & 28 deletions LaunchPad.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = ".build", ".build\.build.csproj", "{166F1873-4CAE-4F54-88B6-5FE79678846B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{5D11C19B-E8E4-4CE3-9C8A-1D368578EBCB}"
ProjectSection(SolutionItems) = preProject
sample\Directory.Packages.props = sample\Directory.Packages.props
sample\Directory.Build.props = sample\Directory.Build.props
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Command", "sample\Sample.Command\Sample.Command.csproj", "{9C03CA0E-4A3B-48F3-9DDD-DE1B325936A9}"
EndProject
Expand Down Expand Up @@ -99,10 +103,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample_Function", "sample\S
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Surgery.LaunchPad.Grpc", "src\Grpc\Rocket.Surgery.LaunchPad.Grpc.csproj", "{7A012ECC-B3E9-4A0B-96BB-EA87DE6EECA8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Surgery.LaunchPad.AspNetCore.Blazor.WebAssembly", "src\AspNetCore.Blazor.WebAssembly\Rocket.Surgery.LaunchPad.AspNetCore.Blazor.WebAssembly.csproj", "{C203D7F2-1896-42B6-9F85-E35C2045C105}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Surgery.LaunchPad.AspNetCore.Blazor", "src\AspNetCore.Blazor\Rocket.Surgery.LaunchPad.AspNetCore.Blazor.csproj", "{EB665FF0-13EA-489A-A2B9-E8220B223A7C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Restful.Client", "sample\Sample.Restful.Client\Sample.Restful.Client.csproj", "{05E51CB7-2C57-4627-B57A-032714CEB21E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Surgery.LaunchPad.WebAssembly.Hosting", "src\WebAssembly.Hosting\Rocket.Surgery.LaunchPad.WebAssembly.Hosting.csproj", "{82F82514-9C91-47A7-B1A5-1D6EC59295F9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Surgery.LaunchPad.AspNetCore.Blazor.WebAssembly", "src\AspNetCore.Blazor.WebAssembly\Rocket.Surgery.LaunchPad.AspNetCore.Blazor.WebAssembly.csproj", "{17EA0A7D-7051-4773-928A-B467C0FF6020}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -587,30 +595,18 @@ Global
{7A012ECC-B3E9-4A0B-96BB-EA87DE6EECA8}.Release|x64.Build.0 = Release|Any CPU
{7A012ECC-B3E9-4A0B-96BB-EA87DE6EECA8}.Release|x86.ActiveCfg = Release|Any CPU
{7A012ECC-B3E9-4A0B-96BB-EA87DE6EECA8}.Release|x86.Build.0 = Release|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Debug|x64.ActiveCfg = Debug|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Debug|x64.Build.0 = Debug|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Debug|x86.ActiveCfg = Debug|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Debug|x86.Build.0 = Debug|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Release|Any CPU.Build.0 = Release|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Release|x64.ActiveCfg = Release|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Release|x64.Build.0 = Release|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Release|x86.ActiveCfg = Release|Any CPU
{C203D7F2-1896-42B6-9F85-E35C2045C105}.Release|x86.Build.0 = Release|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Debug|x64.ActiveCfg = Debug|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Debug|x64.Build.0 = Debug|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Debug|x86.ActiveCfg = Debug|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Debug|x86.Build.0 = Debug|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Release|Any CPU.Build.0 = Release|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Release|x64.ActiveCfg = Release|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Release|x64.Build.0 = Release|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Release|x86.ActiveCfg = Release|Any CPU
{EB665FF0-13EA-489A-A2B9-E8220B223A7C}.Release|x86.Build.0 = Release|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Debug|x64.ActiveCfg = Debug|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Debug|x64.Build.0 = Debug|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Debug|x86.ActiveCfg = Debug|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Debug|x86.Build.0 = Debug|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Release|Any CPU.Build.0 = Release|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Release|x64.ActiveCfg = Release|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Release|x64.Build.0 = Release|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Release|x86.ActiveCfg = Release|Any CPU
{17EA0A7D-7051-4773-928A-B467C0FF6020}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -659,7 +655,6 @@ Global
{3DC043AE-557B-4D07-85F2-2913E446C808} = {DF33E0FB-9790-4654-B60F-8AB22E0CC3D1}
{041A8889-1B35-4BFD-B146-9DA7CB99DAF1} = {5D11C19B-E8E4-4CE3-9C8A-1D368578EBCB}
{7A012ECC-B3E9-4A0B-96BB-EA87DE6EECA8} = {8FFDF555-DB50-45F9-9A2D-6410F39151C3}
{C203D7F2-1896-42B6-9F85-E35C2045C105} = {8FFDF555-DB50-45F9-9A2D-6410F39151C3}
{EB665FF0-13EA-489A-A2B9-E8220B223A7C} = {8FFDF555-DB50-45F9-9A2D-6410F39151C3}
{17EA0A7D-7051-4773-928A-B467C0FF6020} = {8FFDF555-DB50-45F9-9A2D-6410F39151C3}
EndGlobalSection
EndGlobal
Loading