Merge pull request #3 from fluentassertions/fix-awaits

rose-a · web-flow · commit 89fa586191a7 · 2021-11-01T16:48:58.000+01:00
Fix awaits
diff --git a/.editorconfig b/.editorconfig
@@ -134,3 +134,6 @@ dotnet_diagnostic.CA1309.severity = error
 
 # Banned API Analyzers
 dotnet_diagnostic.RS0030.severity = error
+
+# Configure await
+configure_await_analysis_mode = library
diff --git a/.github/workflows/branches.yml b/.github/workflows/branches.yml
@@ -1,72 +1,36 @@
 name: Branch workflow
-on: 
+on:
   push:
-    # branches-ignore:
-    #   - master
-    #   - 'release/**'
-    #   - 'releases/**'
+    branches-ignore:
+      - master
+      - "release/**"
+      - "releases/**"
+    tags-ignore:
+      - v*
+      - V*
   pull_request:
 env:
-  DOTNET_CLI_TELEMETRY_OPTOUT: true  
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
   MSBUILDSINGLELOADCONTEXT: 1
 jobs:
-  generateVersionInfo:  
-    name: GenerateVersionInfo
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Restore dotnet tools
-      run: dotnet tool restore
-    - name: Fetch complete repository including tags
-      run: git fetch --tags --force --prune
-    - name: Generate version info from git history
-      run: dotnet gitversion /output json | jq -r 'to_entries|map("GitVersion_\(.key)=\(.value|tostring)")|.[]' >> gitversion.env && cat gitversion.env
-    - name: Upload version info file
-      uses: actions/upload-artifact@v1
-      with:
-        name: gitversion
-        path: gitversion.env
-
   build:
     name: Build
-    needs: generateVersionInfo
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Download version info file
-      uses: actions/download-artifact@v1
-      with:
-        name: gitversion
-        path: ./
-    - name: Inject version info into environment
-      run: cat ./gitversion.env >> $GITHUB_ENV
-    - name: Build solution
-      run: echo "Current version is \"$GitVersion_SemVer\"" && dotnet build -c Release
-    - name: Create NuGet packages
-      run: dotnet pack -c Release --no-build -o nupkg 
-    - name: Upload nuget packages
-      uses: actions/upload-artifact@v1
-      with:
-        name: nupkg
-        path: nupkg
-
-  test:
-    name: Test
-    needs: [build, generateVersionInfo]
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Download version info file
-      uses: actions/download-artifact@v1
-      with:
-        name: gitversion
-        path: ./
-    - name: Inject version info into environment
-      run: cat ./gitversion.env >> $GITHUB_ENV
-    - name: Run tests
-      run: echo "Current version is \"$GitVersion_SemVer\"" && dotnet test -c Release
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install dependencies
+        run: dotnet restore
+      - name: Build solution
+        run: dotnet build -c Release --no-restore
+      - name: Run tests
+        run: dotnet test -c Release --no-build --verbosity normal
+      - name: Create NuGet packages
+        run: dotnet pack -c Release --no-build -o nupkg
+      - name: Upload nuget packages
+        uses: actions/upload-artifact@v1
+        with:
+          name: nupkg
+          path: nupkg
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -0,0 +1,39 @@
+name: Master workflow
+on:
+  push:
+    branches:
+      - master
+      - "release/**"
+      - "releases/**"
+    tags:
+      - v*
+      - V*
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+  MSBUILDSINGLELOADCONTEXT: 1
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install dependencies
+        run: dotnet restore
+      - name: Build solution
+        run: dotnet build -c Release --no-restore
+      - name: Run tests
+        run: dotnet test -c Release --no-build --verbosity normal
+      - name: Create NuGet packages
+        run: dotnet pack -c Release --no-build -o nupkg
+      - name: Upload nuget packages
+        uses: actions/upload-artifact@v1
+        with:
+          name: nupkg
+          path: nupkg
+      - name: Publish Nuget to GitHub registry
+        run: dotnet nuget push ./nupkg/*.nupkg -s https://api.nuget.org/v3/index.json -k ${NUGET_API_KEY}  
+        env:
+          NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
diff --git a/FluentAssertions.Reactive.sln b/FluentAssertions.Reactive.sln
@@ -20,10 +20,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		GitVersion.yml = GitVersion.yml
-		global.json = global.json
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{9752AE39-8707-49B9-82B8-DB54174DE84F}"
+	ProjectSection(SolutionItems) = preProject
+		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{9D902F3D-7CC4-4EA3-9C38-2751693C6D4A}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\branches.yml = .github\workflows\branches.yml
+		.github\workflows\master.yml = .github\workflows\master.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,6 +75,8 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{FBBA1F0F-2782-4C58-9F66-2CFCBAF043C2} = {00D5194F-4335-4B15-B486-7DB272B65547}
 		{F7FA72E3-365F-4F5C-8B5B-377DDE9B8B2F} = {FF4404AB-62EB-4964-AA9C-E62364EC6952}
+		{9752AE39-8707-49B9-82B8-DB54174DE84F} = {0593589C-673C-47EB-8B56-E6B83DA2580E}
+		{9D902F3D-7CC4-4EA3-9C38-2751693C6D4A} = {9752AE39-8707-49B9-82B8-DB54174DE84F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FB99E965-4EAB-437C-A80D-DB5934C53CE6}
diff --git a/Src/FluentAssertions.Reactive/FluentAssertions.Reactive.csproj b/Src/FluentAssertions.Reactive/FluentAssertions.Reactive.csproj
@@ -4,55 +4,36 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
   </PropertyGroup>
 
   <PropertyGroup>
     <Authors>Alexander Rose</Authors>
     <PackageDescription>
       An extension to use FluidAssertions to test code using the System.Reactive library
     </PackageDescription>
-    <RepositoryUrl>https://github.com/fluentassertions/fluentassertions.reactive</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/fluentassertions/fluentassertions.reactive</PackageProjectUrl>
+    <PackageReleaseNotes>See https://github.com/fluentassertions/fluentassertions.reactive/releases</PackageReleaseNotes>
+    <RepositoryUrl>https://github.com/fluentassertions/fluentassertions.reactive.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>MSTest2;xUnit;NUnit;MSpec;NSpec;TDD;BDD;Fluent;netcore;netstandard;uwp;Reactive</PackageTags>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageIcon>FluentAssertions.png</PackageIcon>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.Reactive.Testing" Version="4.4.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="GitVersionTask" Version="5.6.7">
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="GitVersion.MsBuild" Version="5.7.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="all" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="all" />
     <None Include="..\FluentAssertions.png" Pack="true" Visible="false" PackagePath="" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(GitVersion_SemVer)' != ''">
-    <GetVersion>false</GetVersion>
-    <WriteVersionInfoToBuildLog>false</WriteVersionInfoToBuildLog>
-    <UpdateAssemblyInfo>false</UpdateAssemblyInfo>
-    <GenerateGitVersionInformation>false</GenerateGitVersionInformation>
-
-    <Version>$(GitVersion_FullSemVer)</Version>
-    <VersionPrefix>$(GitVersion_MajorMinorPatch)</VersionPrefix>
-    <VersionSuffix Condition=" '$(UseFullSemVerForNuGet)' == 'false' ">$(GitVersion_NuGetPreReleaseTag)</VersionSuffix>
-    <VersionSuffix Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_PreReleaseTag)</VersionSuffix>
-    <PackageVersion Condition=" '$(UseFullSemVerForNuGet)' == 'false' ">$(GitVersion_NuGetVersion)</PackageVersion>
-    <PackageVersion Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_FullSemVer)</PackageVersion>
-    <InformationalVersion Condition=" '$(InformationalVersion)' == '' ">$(GitVersion_InformationalVersion)</InformationalVersion>
-    <AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(GitVersion_AssemblySemVer)</AssemblyVersion>
-    <FileVersion Condition=" '$(FileVersion)' == '' ">$(GitVersion_AssemblySemFileVer)</FileVersion>
-    <RepositoryBranch Condition=" '$(RepositoryBranch)' == '' ">$(GitVersion_BranchName)</RepositoryBranch>
-    <RepositoryCommit Condition=" '$(RepositoryCommit)' == '' ">$(GitVersion_Sha)</RepositoryCommit>
-  </PropertyGroup>
-
 </Project>
diff --git a/Src/FluentAssertions.Reactive/ReactiveAssertions.cs b/Src/FluentAssertions.Reactive/ReactiveAssertions.cs
@@ -89,7 +89,7 @@ public async Task<AndWhichConstraint<ReactiveAssertions<TPayload>, IEnumerable<T
                     .Timeout(timeout)
                     .Catch<TPayload, TimeoutException>(exception => Observable.Empty<TPayload>())
                     .ToList()
-                    .ToTask();
+                    .ToTask().ConfigureAwait(false);
             }
             catch (Exception e)
             {
@@ -174,7 +174,7 @@ public async Task<ExceptionAssertions<TException>> ThrowAsync<TException>(TimeSp
             string because = "", params object[] becauseArgs)
             where TException : Exception
         {
-            var notifications = await GetRecordedNotifications(timeout);
+            var notifications = await GetRecordedNotifications(timeout).ConfigureAwait(false);
             return Throw<TException>(notifications, because, becauseArgs);
         }
 
@@ -206,7 +206,7 @@ public AndConstraint<ReactiveAssertions<TPayload>> Complete(TimeSpan timeout,
         public async Task<AndConstraint<ReactiveAssertions<TPayload>>> CompleteAsync(TimeSpan timeout,
             string because = "", params object[] becauseArgs)
         {
-            var notifications = await GetRecordedNotifications(timeout);
+            var notifications = await GetRecordedNotifications(timeout).ConfigureAwait(false);
 
             return Complete(timeout, because, becauseArgs, notifications);
         }
diff --git a/Src/FluentAssertions.Reactive/ReactiveExtensions.cs b/Src/FluentAssertions.Reactive/ReactiveExtensions.cs
@@ -78,7 +78,7 @@ public static async Task<TPayload> GetLastMessageAsync<TPayload>(
             this Task<AndWhichConstraint<ReactiveAssertions<TPayload>, IEnumerable<TPayload>>>
                 assertionTask)
         {
-            var constraint = await assertionTask;
+            var constraint = await assertionTask.ConfigureAwait(false);
             return constraint.Subject.LastOrDefault();
         }
         
diff --git a/Tests/FluentAssertions.Reactive.Specs/FluentAssertions.Reactive.Specs.csproj b/Tests/FluentAssertions.Reactive.Specs/FluentAssertions.Reactive.Specs.csproj
@@ -1,16 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/global.json b/global.json

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public async Task<AndWhichConstraint<ReactiveAssertions<TPayload>, IEnumerable<T`
`89`	`89`	`.Timeout(timeout)`
`90`	`90`	`.Catch<TPayload, TimeoutException>(exception => Observable.Empty<TPayload>())`
`91`	`91`	`.ToList()`
`92`		`- .ToTask();`
	`92`	`+ .ToTask().ConfigureAwait(false);`
`93`	`93`	`}`
`94`	`94`	`catch (Exception e)`
`95`	`95`	`{`
`@@ -174,7 +174,7 @@ public async Task<ExceptionAssertions<TException>> ThrowAsync<TException>(TimeSp`
`174`	`174`	`string because = "", params object[] becauseArgs)`
`175`	`175`	`where TException : Exception`
`176`	`176`	`{`
`177`		`- var notifications = await GetRecordedNotifications(timeout);`
	`177`	`+ var notifications = await GetRecordedNotifications(timeout).ConfigureAwait(false);`
`178`	`178`	`return Throw<TException>(notifications, because, becauseArgs);`
`179`	`179`	`}`
`180`	`180`
`@@ -206,7 +206,7 @@ public AndConstraint<ReactiveAssertions<TPayload>> Complete(TimeSpan timeout,`
`206`	`206`	`public async Task<AndConstraint<ReactiveAssertions<TPayload>>> CompleteAsync(TimeSpan timeout,`
`207`	`207`	`string because = "", params object[] becauseArgs)`
`208`	`208`	`{`
`209`		`- var notifications = await GetRecordedNotifications(timeout);`
	`209`	`+ var notifications = await GetRecordedNotifications(timeout).ConfigureAwait(false);`
`210`	`210`
`211`	`211`	`return Complete(timeout, because, becauseArgs, notifications);`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static async Task<TPayload> GetLastMessageAsync<TPayload>(`
`78`	`78`	`this Task<AndWhichConstraint<ReactiveAssertions<TPayload>, IEnumerable<TPayload>>>`
`79`	`79`	`assertionTask)`
`80`	`80`	`{`
`81`		`- var constraint = await assertionTask;`
	`81`	`+ var constraint = await assertionTask.ConfigureAwait(false);`
`82`	`82`	`return constraint.Subject.LastOrDefault();`
`83`	`83`	`}`
`84`	`84`