Skip to content

Commit

Permalink
Merge pull request #29 from pfpack/dev/tech_update
Browse files Browse the repository at this point in the history
dev/tech_update
  • Loading branch information
pmosk authored Nov 27, 2021
2 parents 480712e + b7dd18e commit 803c375
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ name: .NET

on:
push:
branches: [ master, dev, dev/*, feature/*, fix/*, release/* ]
branches: [ main, dev, dev/*, feature/*, fix/*, release/* ]

pull_request:
branches: [ master ]
branches: [ main ]

release:
types: [ published ]
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ PublishScripts/
*.nuget.targets

# Nuget personal access tokens and Credentials
nuget.config
# nuget.config

# Microsoft Azure Build Output
csx/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="2.0.6" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="2.0.6" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="2.0.6" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="2.0.6" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 803c375

Please sign in to comment.