Skip to content

Commit c42aa21

Browse files
sandorfrsandorfr
authored
Merge pull request #29 from geeklearningio/release/0.6.0
Release/0.6.0
2 parents a11e7ee + 6f1555e commit c42aa21

File tree

5 files changed

+24
-48
lines changed

5 files changed

+24
-48
lines changed

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
[![NuGet Pre Release](https://img.shields.io/nuget/vpre/GeekLearning.Templating.svg?maxAge=2592000&label=GeekLearning.Templating)](https://www.nuget.org/packages/GeekLearning.Templating)
2-
[![NuGet Pre Release](https://img.shields.io/nuget/vpre/GeekLearning.Templating.Handlebars.svg?maxAge=2592000&label=GeekLearning.Templating.Handlebars)](https://www.nuget.org/packages/GeekLearning.Templating.Handlebars)
3-
[![NuGet Pre Release](https://img.shields.io/nuget/vpre/GeekLearning.Templating.Mustache.svg?maxAge=2592000&label=GeekLearning.Templating.Mustache)](https://www.nuget.org/packages/GeekLearning.Templating.Mustache)
1+
[![NuGet Version](http://img.shields.io/nuget/v/GeekLearning.Templating.svg?style=flat-square&label=NuGet)](https://www.nuget.org/packages/GeekLearning.Templating/)
42
[![Build Status](https://geeklearning.visualstudio.com/_apis/public/build/definitions/f841b266-7595-4d01-9ee1-4864cf65aa73/24/badge)](#)
53

64
# gl-dotnet-templating

‎samples/GeekLearning.Templating.BasicSample/GeekLearning.Templating.BasicSample.csproj‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>netcoreapp2</TargetFramework>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>GeekLearning.Templating.BasicSample</AssemblyName>
77
<OutputType>Exe</OutputType>
88
<PackageId>GeekLearning.Templating.BasicSample</PackageId>
9-
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
10-
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
119
</PropertyGroup>
1210

1311
<ItemGroup>
@@ -23,18 +21,18 @@
2321
</ItemGroup>
2422

2523
<ItemGroup>
26-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
27-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
28-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
32-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
33-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
34-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
35-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
36-
<PackageReference Include="GeekLearning.Storage.FileSystem" Version="0.7.0" />
37-
<PackageReference Include="GeekLearning.Storage.Azure" Version="0.7.0" />
24+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
25+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
26+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
34+
<PackageReference Include="GeekLearning.Storage.FileSystem" Version="0.8.0" />
35+
<PackageReference Include="GeekLearning.Storage.Azure" Version="0.8.0" />
3836
</ItemGroup>
3937

4038
</Project>

‎src/GeekLearning.Templating.Handlebars/GeekLearning.Templating.Handlebars.csproj‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,18 @@
44
<Description>Handlebars Provider for Geek Learning Templating Abstractions.</Description>
55
<VersionPrefix>0.0.1</VersionPrefix>
66
<Authors>Geek Learning;Cyprien Autexier;Adrien Siffermann</Authors>
7-
<TargetFrameworks>net45;netstandard1.5</TargetFrameworks>
7+
<TargetFrameworks>netstandard2</TargetFrameworks>
88
<AssemblyName>GeekLearning.Templating.Handlebars</AssemblyName>
99
<PackageId>GeekLearning.Templating.Handlebars</PackageId>
10-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
1413
<ProjectReference Include="..\GeekLearning.Templating\GeekLearning.Templating.csproj" />
1514
</ItemGroup>
1615

1716
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.1" />
19-
<PackageReference Include="Handlebars.NetStandard" Version="1.8.1" />
20-
</ItemGroup>
21-
22-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
23-
<Reference Include="System" />
24-
<Reference Include="Microsoft.CSharp" />
25-
</ItemGroup>
26-
27-
<ItemGroup>
28-
<Folder Include="Properties\" />
17+
<PackageReference Include="Handlebars.Net" Version="1.9.0" />
18+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
2919
</ItemGroup>
3020

3121
</Project>

‎src/GeekLearning.Templating.Mustache/GeekLearning.Templating.Mustache.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,18 @@
44
<Description>Mustache.js Provider for Geek Learning Templating Abstractions.</Description>
55
<VersionPrefix>0.0.1</VersionPrefix>
66
<Authors>Geek Learning;Cyprien Autexier;Adrien Siffermann</Authors>
7-
<TargetFramework>netstandard1.1</TargetFramework>
7+
<TargetFramework>netstandard2</TargetFramework>
88
<AssemblyName>GeekLearning.Templating.Mustache</AssemblyName>
99
<PackageId>GeekLearning.Templating.Mustache</PackageId>
10-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
1413
<ProjectReference Include="..\GeekLearning.Templating\GeekLearning.Templating.csproj" />
1514
</ItemGroup>
1615

1716
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.1" />
19-
<PackageReference Include="mustache-netstandard" Version="0.1.3" />
20-
</ItemGroup>
21-
22-
<ItemGroup>
23-
<Folder Include="Properties\" />
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
18+
<PackageReference Include="mustache-sharp" Version="0.2.10" />
2419
</ItemGroup>
2520

2621
</Project>

‎src/GeekLearning.Templating/GeekLearning.Templating.csproj‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@
44
<Description>Templating abstractions with providers.</Description>
55
<VersionPrefix>0.0.1</VersionPrefix>
66
<Authors>Geek Learning;Cyprien Autexier;Adrien Siffermann</Authors>
7-
<TargetFramework>netstandard1.1</TargetFramework>
7+
<TargetFramework>netstandard2</TargetFramework>
88
<AssemblyName>GeekLearning.Templating</AssemblyName>
99
<PackageId>GeekLearning.Templating</PackageId>
10-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.1" />
15-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="1.1.2" />
16-
<PackageReference Include="GeekLearning.Storage" Version="0.7.0" />
17-
</ItemGroup>
18-
19-
<ItemGroup>
20-
<Folder Include="Properties\" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.0" />
15+
<PackageReference Include="GeekLearning.Storage" Version="0.8.0" />
2116
</ItemGroup>
2217

2318
</Project>

0 commit comments

Comments
 (0)