Skip to content

Commit 22c415c

Browse files
rose-arose-a
committed
update dependencies, refactor workflows
1 parent 0af8138 commit 22c415c

File tree

3 files changed

+39
-113
lines changed

3 files changed

+39
-113
lines changed

‎.github/workflows/branches.yml‎

Lines changed: 31 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,47 @@
11
name: Branch workflow
2-
on:
2+
on:
33
push:
4-
# branches-ignore:
5-
# - master
6-
# - 'release/**'
7-
# - 'releases/**'
4+
branches-ignore:
5+
- master
6+
- "release/**"
7+
- "releases/**"
8+
tags-ignore:
9+
- v*
10+
- V*
811
pull_request:
912
env:
10-
DOTNET_CLI_TELEMETRY_OPTOUT: true
13+
DOTNET_CLI_TELEMETRY_OPTOUT: true
1114
MSBUILDSINGLELOADCONTEXT: 1
1215
jobs:
13-
generateVersionInfo:
14-
name: GenerateVersionInfo
15-
runs-on: ubuntu-latest
16-
steps:
17-
- name: Checkout
18-
uses: actions/checkout@v2
19-
with:
20-
fetch-depth: 0
21-
- name: Restore dotnet tools
22-
run: dotnet tool restore
23-
- name: Fetch complete repository including tags
24-
run: git fetch --tags --force --prune
25-
- name: Generate version info from git history
26-
run: dotnet gitversion /output json | jq -r 'to_entries|map("GitVersion_\(.key)=\(.value|tostring)")|.[]' >> gitversion.env && cat gitversion.env
27-
- name: Upload version info file
28-
uses: actions/upload-artifact@v1
29-
with:
30-
name: gitversion
31-
path: gitversion.env
32-
3316
build:
3417
name: Build
35-
needs: generateVersionInfo
3618
runs-on: ubuntu-latest
3719
steps:
38-
- name: Checkout
39-
uses: actions/checkout@v2
40-
- name: Download version info file
41-
uses: actions/download-artifact@v1
42-
with:
43-
name: gitversion
44-
path: ./
45-
- name: Inject version info into environment
46-
run: cat ./gitversion.env >> $GITHUB_ENV
47-
- name: Build solution
48-
run: echo "Current version is \"$GitVersion_SemVer\"" && dotnet build -c Release
49-
- name: Create NuGet packages
50-
run: dotnet pack -c Release --no-build -o nupkg
51-
- name: Upload nuget packages
52-
uses: actions/upload-artifact@v1
53-
with:
54-
name: nupkg
55-
path: nupkg
20+
- name: Checkout
21+
uses: actions/checkout@v2
22+
- name: Build solution
23+
run: dotnet build -c Release
24+
- name: Create NuGet packages
25+
run: dotnet pack -c Release --no-build -o nupkg
26+
- name: Upload nuget packages
27+
uses: actions/upload-artifact@v1
28+
with:
29+
name: nupkg
30+
path: nupkg
5631

5732
test:
5833
name: Test
5934
needs: [build, generateVersionInfo]
6035
runs-on: ubuntu-latest
6136
steps:
62-
- name: Checkout
63-
uses: actions/checkout@v2
64-
- name: Download version info file
65-
uses: actions/download-artifact@v1
66-
with:
67-
name: gitversion
68-
path: ./
69-
- name: Inject version info into environment
70-
run: cat ./gitversion.env >> $GITHUB_ENV
71-
- name: Run tests
72-
run: echo "Current version is \"$GitVersion_SemVer\"" && dotnet test -c Release
37+
- name: Checkout
38+
uses: actions/checkout@v2
39+
- name: Download version info file
40+
uses: actions/download-artifact@v1
41+
with:
42+
name: gitversion
43+
path: ./
44+
- name: Inject version info into environment
45+
run: cat ./gitversion.env >> $GITHUB_ENV
46+
- name: Run tests
47+
run: echo "Current version is \"$GitVersion_SemVer\"" && dotnet test -c Release

‎.github/workflows/master.yml‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,21 @@ on:
55
- master
66
- 'release/**'
77
- 'releases/**'
8-
tags:
8+
tags:
99
- v*
1010
- V*
1111
env:
1212
DOTNET_CLI_TELEMETRY_OPTOUT: true
1313
MSBUILDSINGLELOADCONTEXT: 1
1414
jobs:
15-
generateVersionInfo:
16-
name: GenerateVersionInfo
17-
runs-on: ubuntu-latest
18-
steps:
19-
- name: Checkout
20-
uses: actions/checkout@v2
21-
with:
22-
fetch-depth: 0
23-
- name: Restore dotnet tools
24-
run: dotnet tool restore
25-
- name: Fetch complete repository including tags
26-
run: git fetch --tags --force --prune
27-
- name: Generate version info from git history
28-
run: dotnet gitversion /output json | jq -r 'to_entries|map("GitVersion_\(.key)=\(.value|tostring)")|.[]' >> gitversion.env && cat gitversion.env
29-
- name: Upload version info file
30-
uses: actions/upload-artifact@v1
31-
with:
32-
name: gitversion
33-
path: gitversion.env
34-
3515
build:
3616
name: Build
37-
needs: generateVersionInfo
3817
runs-on: ubuntu-latest
3918
steps:
4019
- name: Checkout
4120
uses: actions/checkout@v2
42-
- name: Download version info file
43-
uses: actions/download-artifact@v1
44-
with:
45-
name: gitversion
46-
path: ./
47-
- name: Inject version info into environment
48-
run: cat ./gitversion.env >> $GITHUB_ENV
4921
- name: Build solution
50-
run: echo "Current version is \"$GitVersion_SemVer\"" && dotnet build -c Release
22+
run: dotnet build -c Release
5123
- name: Create NuGet packages
5224
run: dotnet pack -c Release --no-build -o nupkg
5325
- name: Upload nuget packages

‎Src/FluentAssertions.Reactive/FluentAssertions.Reactive.csproj‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
7+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
78
</PropertyGroup>
89

910
<PropertyGroup>
@@ -18,43 +19,21 @@
1819
<PackageTags>MSTest2;xUnit;NUnit;MSpec;NSpec;TDD;BDD;Fluent;netcore;netstandard;uwp;Reactive</PackageTags>
1920
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
2021
<PackageIcon>FluentAssertions.png</PackageIcon>
21-
<LangVersion>8.0</LangVersion>
22+
<LangVersion>latest</LangVersion>
2223
</PropertyGroup>
2324

2425
<ItemGroup>
25-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
26-
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.4.1" />
27-
</ItemGroup>
28-
29-
<ItemGroup>
30-
<PackageReference Include="GitVersionTask" Version="5.6.7">
26+
<PackageReference Include="FluentAssertions" Version="6.2.0" />
27+
<PackageReference Include="GitVersion.MsBuild" Version="5.7.0">
3128
<PrivateAssets>all</PrivateAssets>
3229
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3330
</PackageReference>
31+
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
3432
</ItemGroup>
3533

3634
<ItemGroup>
37-
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="all" />
35+
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="all" />
3836
<None Include="..\FluentAssertions.png" Pack="true" Visible="false" PackagePath="" />
3937
</ItemGroup>
4038

41-
<PropertyGroup Condition=" '$(GitVersion_SemVer)' != ''">
42-
<GetVersion>false</GetVersion>
43-
<WriteVersionInfoToBuildLog>false</WriteVersionInfoToBuildLog>
44-
<UpdateAssemblyInfo>false</UpdateAssemblyInfo>
45-
<GenerateGitVersionInformation>false</GenerateGitVersionInformation>
46-
47-
<Version>$(GitVersion_FullSemVer)</Version>
48-
<VersionPrefix>$(GitVersion_MajorMinorPatch)</VersionPrefix>
49-
<VersionSuffix Condition=" '$(UseFullSemVerForNuGet)' == 'false' ">$(GitVersion_NuGetPreReleaseTag)</VersionSuffix>
50-
<VersionSuffix Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_PreReleaseTag)</VersionSuffix>
51-
<PackageVersion Condition=" '$(UseFullSemVerForNuGet)' == 'false' ">$(GitVersion_NuGetVersion)</PackageVersion>
52-
<PackageVersion Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_FullSemVer)</PackageVersion>
53-
<InformationalVersion Condition=" '$(InformationalVersion)' == '' ">$(GitVersion_InformationalVersion)</InformationalVersion>
54-
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(GitVersion_AssemblySemVer)</AssemblyVersion>
55-
<FileVersion Condition=" '$(FileVersion)' == '' ">$(GitVersion_AssemblySemFileVer)</FileVersion>
56-
<RepositoryBranch Condition=" '$(RepositoryBranch)' == '' ">$(GitVersion_BranchName)</RepositoryBranch>
57-
<RepositoryCommit Condition=" '$(RepositoryCommit)' == '' ">$(GitVersion_Sha)</RepositoryCommit>
58-
</PropertyGroup>
59-
6039
</Project>

0 commit comments

Comments
 (0)