Skip to content

Commit

Permalink
Updated templates
Browse files Browse the repository at this point in the history
  • Loading branch information
david-driscoll committed Aug 23, 2019
1 parent 42b0fc2 commit 02bd409
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .build/.build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="0.21.2" />
<PackageReference Include="Rocket.Surgery.Nuke.DotNetCore" Version="0.3.5" />
<PackageReference Include="Rocket.Surgery.Nuke.DotNetCore" Version="0.3.8" />
<PackageReference Include="GitVersion.CommandLine.DotNetCore" Version="5.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
3 changes: 2 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<Company>Rocket Surgeons Guild</Company>
<Copyright>Copyright David Driscoll © 2017</Copyright>
<Authors>David Driscoll</Authors>
<LangVersion>latest</LangVersion>
<LangVersion>8.0</LangVersion>
<Nullable>enable</Nullable>
<PackageIconUrl>https://raw.githubusercontent.com/RocketSurgeonsGuild/graphics/master/png/rsg-patch-circle-color.png</PackageIconUrl>
</PropertyGroup>
</Project>
12 changes: 6 additions & 6 deletions templates/Api/Rocket.Surgery.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Build.Metadata" Version="3.3.10" IncludeAssets="Analyzers;Build" PrivateAssets="All" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc2-preview-0910" />
<PackageReference Include="Rocket.Surgery.Hosting" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Conventions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Hosting" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Conventions" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview8.19405.7" />
<!--#endif -->
</ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions templates/Cli/Rocket.Surgery.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Build.Metadata" Version="3.3.10" IncludeAssets="Analyzers;Build" PrivateAssets="All" />
<PackageReference Include="Rocket.Surgery.Hosting" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Conventions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Hosting" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Conventions" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging" Version="7.0.5" />
<!--#endif -->
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions templates/Function/Rocket.Surgery.Functions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<PackageReference Include="Rocket.Surgery.Build.Metadata" Version="3.3.10" IncludeAssets="Analyzers;Build" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.29" />
<PackageReference Include="Rocket.Surgery.Hosting.Functions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Conventions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Hosting.Functions" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Conventions" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging" Version="7.0.5" />
<!--#endif -->
</ItemGroup>
<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions templates/GenericHost/Rocket.Surgery.GenericHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Build.Metadata" Version="3.3.10" IncludeAssets="Analyzers;Build" PrivateAssets="All" />
<PackageReference Include="Rocket.Surgery.Hosting" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Conventions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Hosting" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Conventions" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging" Version="7.0.5" />
<!--#endif -->
</ItemGroup>
</Project>
16 changes: 8 additions & 8 deletions templates/Library/Rocket.Surgery.Library.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,62 +8,62 @@
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Build.Metadata" Version="3.3.10" IncludeAssets="Analyzers;Build" PrivateAssets="All" />
<PackageReference Include="Rocket.Surgery.Conventions.Abstractions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Conventions.Abstractions" Version="7.0.5" />
<!--#endif -->
<!--#if (commandline) -->
<!--#if (no-version)
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine.Abstractions" />
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine.Abstractions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine.Abstractions" Version="7.0.5" />
<!--#endif -->
<!--#endif -->
<!--#if (!no-configuration) -->
<!--#if (no-version)
<PackageReference Include="Rocket.Surgery.Extensions.Configuration.Abstractions" />
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Extensions.Configuration.Abstractions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration.Abstractions" Version="7.0.5" />
<!--#endif -->
<!--#endif -->
<!--#if (logging) -->
<!--#if (no-version)
<PackageReference Include="Rocket.Surgery.Extensions.Logging.Abstractions" />
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Extensions.Logging.Abstractions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging.Abstractions" Version="7.0.5" />
<!--#endif -->
<!--#endif -->
<!--#if (serilog) -->
<!--#if (no-version)
<PackageReference Include="Rocket.Surgery.Extensions.Serilog.Abstractions" />
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Extensions.Serilog.Abstractions" Version="6.0.3" />
<PackageReference Include="Rocket.Surgery.Extensions.Serilog.Abstractions" Version="7.0.0" />
<!--#endif -->
<!--#endif -->
<!--#if (!no-services) -->
<!--#if (no-version)
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection.Abstractions" />
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection.Abstractions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection.Abstractions" Version="7.0.5" />
<!--#endif -->
<!--#endif -->
<!--#if (autofac) -->
<!--#if (no-version)
<PackageReference Include="Rocket.Surgery.Extensions.Autofac.Abstractions" />
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Extensions.Autofac.Abstractions" Version="5.0.3" />
<PackageReference Include="Rocket.Surgery.Extensions.Autofac.Abstractions" Version="6.0.2" />
<!--#endif -->
<!--#endif -->
<!--#if (webjobs) -->
<!--#if (no-version)
<PackageReference Include="Rocket.Surgery.Extensions.Autofac.Abstractions" />
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Extensions.WebJobs.Abstractions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.WebJobs.Abstractions" Version="7.0.5" />
<!--#endif -->
<!--#endif -->
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion templates/Solution/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Company>Rocket Surgeons Guild</Company>
<Copyright>Copyright David Driscoll © 2017</Copyright>
<Authors>David Driscoll</Authors>
<LangVersion>latest</LangVersion>
<LangVersion>8.0</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions templates/Solution/Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Update="Nuke.Common" Version="0.21.2" />
<PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.3.5" />
<PackageReference Update="Rocket.Surgery.Nuke.DotNetCore" Version="0.3.8" />
<PackageReference Update="GitVersion.CommandLine.DotNetCore" Version="5.0.1" />
<PackageReference Update="ReportGenerator" Version="4.2.15" />
</ItemGroup>
<ItemGroup></ItemGroup>
<ItemGroup>
<PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="1.1.13" />
<PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="1.2.1" />
<PackageReference Update="Autofac.Extras.FakeItEasy" Version="5.0.1" />
<PackageReference Update="Bogus" Version="28.0.2" />
<PackageReference Update="coverlet.collector" Version="1.0.1" />
Expand Down
13 changes: 6 additions & 7 deletions templates/Web/Rocket.Surgery.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
#endif -->
<!--#if (!no-version) -->
<PackageReference Include="Rocket.Surgery.Build.Metadata" Version="3.3.10" IncludeAssets="Analyzers;Build" PrivateAssets="All" />
<PackageReference Include="Rocket.Surgery.Hosting" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Conventions" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions" Version="1.0.3" />
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging" Version="7.0.2" />
<PackageReference Include="Rocket.Surgery.Hosting" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Conventions" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.CommandLine" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="7.0.5" />
<PackageReference Include="Rocket.Surgery.Extensions.Logging" Version="7.0.5" />
<!--#endif -->
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup>
<PackageReference Include="Rocket.Surgery.Extensions.Testing" Version="1.1.13" />
<PackageReference Include="Rocket.Surgery.Extensions.Testing" Version="1.2.1" />
<PackageReference Include="Autofac.Extras.FakeItEasy" Version="5.0.1" />
<PackageReference Include="Bogus" Version="28.0.2" />
<PackageReference Include="coverlet.collector" Version="1.0.1" />
Expand Down

0 comments on commit 02bd409

Please sign in to comment.