Skip to content

Commit adb94bd

Browse files
egilegil
committed
Merge branch 'master' into dev
2 parents 3e4e3c8 + 70b897f commit adb94bd

File tree

5 files changed

+27
-23
lines changed

5 files changed

+27
-23
lines changed

.github/workflows/main.yml renamed to .github/workflows/CI.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: CI
32

43
on: push
@@ -25,20 +24,20 @@ jobs:
2524
files: '["*.csproj", "**/*.csproj"]'
2625
- uses: actions/setup-dotnet@v1
2726
with:
28-
dotnet-version: '3.1.100'
27+
dotnet-version: '3.1.101'
2928
- name: Building and verifying library
3029
run: |
3130
dotnet build -c Release
3231
dotnet test -c Release /nowarn:CS1591
3332
dotnet build sample -c Release
3433
dotnet test sample -c Release
3534
- name: Creating library package
36-
run: dotnet pack src/ -c Release -o ${GITHUB_WORKSPACE} -p:version=$VERSION /nowarn:CS1591
35+
run: dotnet pack src/ -c Release -o ${GITHUB_WORKSPACE}/lib -p:version=$VERSION /nowarn:CS1591
3736
- name: Buidling template package
38-
run: dotnet pack template/ -c Release -o ${GITHUB_WORKSPACE} -p:version=$VERSION -p:PackageVersion=$VERSION
37+
run: dotnet pack template/ -c Release -o ${GITHUB_WORKSPACE}/template -p:version=$VERSION -p:PackageVersion=$VERSION
3938
- name: Verifying template
4039
run: |
41-
dotnet new --install ${GITHUB_WORKSPACE}/Razor.Components.Testing.Library.Template.$VERSION.nupkg
40+
dotnet new --install ${GITHUB_WORKSPACE}/template/Razor.Components.Testing.Library.Template.$VERSION.nupkg
4241
dotnet new razortest -o ${GITHUB_WORKSPACE}/Test
43-
dotnet restore ${GITHUB_WORKSPACE}/Test/Test.csproj --source ${GITHUB_WORKSPACE}
42+
dotnet restore ${GITHUB_WORKSPACE}/Test/Test.csproj --source ${GITHUB_WORKSPACE}/lib
4443
dotnet test ${GITHUB_WORKSPACE}/Test

‎.github/workflows/nuget-pack-push.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
name: CD
1+
name: NUGET-PACK-PUSH
22

33
on:
44
release:
55
types:
6-
- published
6+
- published
7+
- edited
78

89
env:
910
VERSION: 0.0.0
@@ -34,14 +35,16 @@ jobs:
3435
dotnet build -c Release /nowarn:CS1591
3536
dotnet test -c Release /nowarn:CS1591
3637
- name: Creating library package
37-
run: dotnet pack src/ -c Release -o ${GITHUB_WORKSPACE} -p:version=$VERSION /nowarn:CS1591
38+
run: dotnet pack src/ -c Release -o ${GITHUB_WORKSPACE}/lib -p:version=$VERSION /nowarn:CS1591
3839
- name: Buidling template package
39-
run: dotnet pack template/ -c Release -o ${GITHUB_WORKSPACE} -p:version=$VERSION -p:PackageVersion=$VERSION
40+
run: dotnet pack template/ -c Release -o ${GITHUB_WORKSPACE}/template -p:version=$VERSION -p:PackageVersion=$VERSION
4041
- name: Verifying template
4142
run: |
42-
dotnet new --install ${GITHUB_WORKSPACE}/Razor.Components.Testing.Library.Template.$VERSION.nupkg
43+
dotnet new --install ${GITHUB_WORKSPACE}/template/Razor.Components.Testing.Library.Template.$VERSION.nupkg
4344
dotnet new razortest -o ${GITHUB_WORKSPACE}/Test
44-
dotnet restore ${GITHUB_WORKSPACE}/Test/Test.csproj --source ${GITHUB_WORKSPACE}
45+
dotnet restore ${GITHUB_WORKSPACE}/Test/Test.csproj --source ${GITHUB_WORKSPACE}/lib
4546
dotnet test ${GITHUB_WORKSPACE}/Test
4647
- name: Push packages to NuGet.org
47-
run: dotnet nuget push ${GITHUB_WORKSPACE}/*.nupkg -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
48+
run: |
49+
dotnet nuget push ${GITHUB_WORKSPACE}/lib/*.nupkg -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
50+
dotnet nuget push ${GITHUB_WORKSPACE}/template/*.nupkg -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/egil/razor-components-testing-library/CI?logo=github)](https://github.com/egil/razor-components-testing-library/actions?query=workflow%3ACI)
2-
[![GitHub tag (latest SemVer pre-release)](https://img.shields.io/github/v/tag/egil/razor-components-testing-library?include_prereleases&logo=github)](https://github.com/egil/razor-components-testing-library/releases)
3-
[![Nuget](https://img.shields.io/nuget/dt/Razor.Components.Testing.Library?logo=nuget)](https://www.nuget.org/packages/Razor.Components.Testing.Library/)
4-
[![Issues Open](https://img.shields.io/github/issues/egil/razor-components-testing-library.svg?style=flat-square&logo=github)](https://github.com/egil/razor-components-testing-library/issues)
5-
[![Gitter](https://img.shields.io/gitter/room/razor-components-testing-library/community?logo=gitter)](https://gitter.im/razor-components-testing-library/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
1+
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/egil/razor-components-testing-library/CI?logo=github&style=flat-square)](https://github.com/egil/razor-components-testing-library/actions?query=workflow%3ACI)
2+
[![GitHub tag (latest SemVer pre-release)](https://img.shields.io/github/v/tag/egil/razor-components-testing-library?include_prereleases&logo=github&style=flat-square)](https://github.com/egil/razor-components-testing-library/releases)
3+
[![Nuget](https://img.shields.io/nuget/dt/Razor.Components.Testing.Library?logo=nuget&style=flat-square)](https://www.nuget.org/packages/Razor.Components.Testing.Library/)
4+
[![Issues Open](https://img.shields.io/github/issues/egil/razor-components-testing-library.svg?style=flat-square&logo=github&style=flat-square)](https://github.com/egil/razor-components-testing-library/issues)
5+
[![Gitter](https://img.shields.io/gitter/room/razor-components-testing-library/community?logo=gitter&style=flat-square)](https://gitter.im/razor-components-testing-library/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
66

77
# Blazor Components Testing Library
88

@@ -28,4 +28,4 @@ This library's goal is to make it easy to write _comprehensive, stable unit test
2828
Shout outs and a big thank you to the contributors to this library. Here they are, in alphabetically:
2929

3030
- [Michael J Conrad (@Siphonophora)](https://github.com/Siphonophora)
31-
- [Rastislav Novotný (@duracellko)](https://github.com/duracellko)
31+
- [Rastislav Novotný (@duracellko)](https://github.com/duracellko)

‎src/Egil.RazorComponents.Testing.Library.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,18 @@ This library's goal is to make it easy to write comprehensive, stable unit tests
3434
<IncludeSymbols>true</IncludeSymbols>
3535
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
3636
</PropertyGroup>
37+
38+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
39+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
40+
</PropertyGroup>
3741

3842
<ItemGroup>
3943
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
4044
</ItemGroup>
4145

4246
<ItemGroup>
43-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.0" />
44-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
47+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.*" />
48+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.*" />
4549
</ItemGroup>
4650

4751
<ItemGroup>

‎template/template/Company.RazorTests1.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
1210
<PackageReference Include="Razor.Components.Testing.Library" Version="#{VERSION}#" />
1311
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1412
<PackageReference Include="xunit" Version="2.4.1" />

0 commit comments

Comments
 (0)