Skip to content

Commit

Permalink
Merge pull request #9 from conficient/v1.1
Browse files Browse the repository at this point in the history
V1 1 - fixes #8
  • Loading branch information
conficient authored Apr 13, 2021
2 parents e0a89b7 + e2ee745 commit 683448c
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 3 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/dotnet-core-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: .NET Core build+test for pull requests

on:
pull_request:
branches: [ main ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test
run: dotnet test --no-restore --verbosity normal
2 changes: 0 additions & 2 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: .NET Core build pack and push
on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:
Expand Down
6 changes: 6 additions & 0 deletions BlazorTemplater.sln
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B0E3EF40-C
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorTemplater.ConsoleApp", "BlazorTemplater.ConsoleApp\BlazorTemplater.ConsoleApp.csproj", "{B1C3C891-8000-4AAB-AEAA-1902EDF6D3B0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github", "github", "{B8C750B3-D263-4450-84C8-EB1A54F12BA5}"
ProjectSection(SolutionItems) = preProject
.github\workflows\dotnet-core-pr.yml = .github\workflows\dotnet-core-pr.yml
.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion BlazorTemplater/BlazorTemplater.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PackageProjectUrl>https://github.com/conficient/BlazorTemplater</PackageProjectUrl>
<RepositoryUrl>https://github.com/conficient/BlazorTemplater</RepositoryUrl>
<PackageTags>Blazor RazorComponents HTML Email Templating</PackageTags>
<Version>1.1.0</Version>
<Version>1.1.1</Version>
<PackageReleaseNotes>Breaking change: renamed BlazorTemplater class to Templater</PackageReleaseNotes>
</PropertyGroup>

Expand Down

0 comments on commit 683448c

Please sign in to comment.