From ccb4cc104759c46c07f7afb95dc1689e93dffc4c Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 16:29:06 -0800 Subject: [PATCH 01/34] Add Unit Test Timeouts --- .../AsyncCommandTests/AsyncCommand_Tests.cs | 14 +++++++------- .../AsyncCommandTests/IAsyncCommand_Tests.cs | 4 ++-- .../ICommand_AsyncCommand_Tests.cs | 8 ++++---- .../AsyncValueCommand_Tests.cs | 12 ++++++------ .../ICommand_AsyncValueCommand_Tests.cs | 8 ++++---- .../ObjectModel/ICommandTests/BaseCommandTests.cs | 1 + 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/AsyncCommand_Tests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/AsyncCommand_Tests.cs index 9bdca56ae..bf6cbfa15 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/AsyncCommand_Tests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/AsyncCommand_Tests.cs @@ -164,7 +164,7 @@ public void AsyncCommand_NoParameter_NoCanExecute_Test() Assert.True(command.CanExecute(null)); } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncCommand_RaiseCanExecuteChanged_MainThreadCreation_MainThreadExecution_Test() { // Arrange @@ -213,7 +213,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e) } } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public Task AsyncCommand_RaiseCanExecuteChanged_BackgroundThreadCreation_BackgroundThreadExecution_Test() => Task.Run(async () => { // Arrange @@ -267,7 +267,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e) } }); - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncCommand_RaiseCanExecuteChanged_MainThreadCreation_BackgroundThreadExecution_Test() { // Arrange @@ -322,7 +322,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e) } } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncCommand_RaiseCanExecuteChanged_BackgroundThreadCreation_MainThreadExecution_Test() { // Arrange @@ -380,7 +380,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e) } } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncCommand_ChangeCanExecute_Test() { // Arrange @@ -429,7 +429,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e) } } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncCommand_CanExecuteChanged_AllowsMultipleExecutions_Test() { // Arrange @@ -459,7 +459,7 @@ public async Task AsyncCommand_CanExecuteChanged_AllowsMultipleExecutions_Test() void handleCanExecuteChanged(object? sender, EventArgs e) => canExecuteChangedCount++; } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncCommand_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test() { // Arrange diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/IAsyncCommand_Tests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/IAsyncCommand_Tests.cs index b29ab3750..3b0578e25 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/IAsyncCommand_Tests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/IAsyncCommand_Tests.cs @@ -177,7 +177,7 @@ public void IAsyncCommand_NoParameter_CanExecuteFalse_NoParameter_Test() Assert.False(command.CanExecute(null)); } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task IAsyncCommand_CanExecuteChanged_AllowsMultipleExecutions_Test() { // Arrange @@ -207,7 +207,7 @@ public async Task IAsyncCommand_CanExecuteChanged_AllowsMultipleExecutions_Test( void handleCanExecuteChanged(object? sender, EventArgs e) => canExecuteChangedCount++; } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task IAsyncCommand_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test() { // Arrange diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/ICommand_AsyncCommand_Tests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/ICommand_AsyncCommand_Tests.cs index 9eaf36fa9..d0b55b33b 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/ICommand_AsyncCommand_Tests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncCommandTests/ICommand_AsyncCommand_Tests.cs @@ -190,7 +190,7 @@ public void ICommand_Parameter_CanExecuteChanged_Test() Assert.False(command.CanExecute(false)); } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task ICommand_Parameter_CanExecuteChanged_AllowsMultipleExecutions_Test() { // Arrange @@ -218,7 +218,7 @@ public async Task ICommand_Parameter_CanExecuteChanged_AllowsMultipleExecutions_ command.CanExecuteChanged -= handleCanExecuteChanged; } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task ICommand_Parameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test() { // Arrange @@ -263,7 +263,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e) } } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task ICommand_NoParameter_CanExecuteChanged_AllowsMultipleExecutions_Test() { // Arrange @@ -291,7 +291,7 @@ public async Task ICommand_NoParameter_CanExecuteChanged_AllowsMultipleExecution command.CanExecuteChanged -= handleCanExecuteChanged; } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task ICommand_NoParameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test() { // Arrange diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/AsyncValueCommand_Tests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/AsyncValueCommand_Tests.cs index 135d17e40..5cb578862 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/AsyncValueCommand_Tests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/AsyncValueCommand_Tests.cs @@ -187,7 +187,7 @@ public void AsyncValueCommandNoParameter_NoCanExecute_Test() Assert.True(command.CanExecute(null)); } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncValueCommand_RaiseCanExecuteChanged_Test() { // Arrange @@ -236,7 +236,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e) } } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncValueCommand_ChangeCanExecute_Test() { // Arrange @@ -285,7 +285,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e) } } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncValueCommand_Parameter_CanExecuteChanged_AllowsMultipleExecutions_Test() { // Arrange @@ -315,7 +315,7 @@ public async Task AsyncValueCommand_Parameter_CanExecuteChanged_AllowsMultipleEx command.CanExecuteChanged -= handleCanExecuteChanged; } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncValueCommand_Parameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test() { // Arrange @@ -363,7 +363,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e) Assert.Equal(canExecuteChangedCount, handleCanExecuteChangedResult); } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncValueCommand_NoParameter_CanExecuteChanged_AllowsMultipleExecutions_Test() { // Arrange @@ -393,7 +393,7 @@ public async Task AsyncValueCommand_NoParameter_CanExecuteChanged_AllowsMultiple command.CanExecuteChanged -= handleCanExecuteChanged; } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task AsyncValueCommand_NoParameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test() { // Arrange diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/ICommand_AsyncValueCommand_Tests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/ICommand_AsyncValueCommand_Tests.cs index 2d23f1fc2..cbe25b61f 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/ICommand_AsyncValueCommand_Tests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/ICommand_AsyncValueCommand_Tests.cs @@ -216,7 +216,7 @@ public void ICommand_Parameter_CanExecuteChanged_Test() Assert.False(command.CanExecute(false)); } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task ICommand_Parameter_CanExecuteChanged_AllowsMultipleExecutions_Test() { // Arrange @@ -243,7 +243,7 @@ public async Task ICommand_Parameter_CanExecuteChanged_AllowsMultipleExecutions_ command.CanExecuteChanged -= handleCanExecuteChanged; } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task ICommand_Parameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test() { // Arrange @@ -287,7 +287,7 @@ async void handleCanExecuteChanged(object? sender, EventArgs e) Assert.Equal(canExecuteChangedCount, handleCanExecuteChangedResult); } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task ICommand_NoParameter_CanExecuteChanged_AllowsMultipleExecutions_Test() { // Arrange @@ -315,7 +315,7 @@ public async Task ICommand_NoParameter_CanExecuteChanged_AllowsMultipleExecution command.CanExecuteChanged -= handleCanExecuteChanged; } - [Fact] + [Fact(Timeout = ICommandTestTimeout)] public async Task ICommand_NoParameter_CanExecuteChanged_DoesNotAllowMultipleExecutions_Test() { // Arrange diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/BaseCommandTests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/BaseCommandTests.cs index 7b0ca54d1..018e5c89b 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/BaseCommandTests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/BaseCommandTests.cs @@ -9,6 +9,7 @@ namespace Xamarin.CommunityToolkit.UnitTests.ObjectModel.ICommandTests [Collection(nameof(BaseCommandTests))] public abstract class BaseCommandTests { + public const int ICommandTestTimeout = Delay * 6; public const int Delay = 500; public BaseCommandTests() => Device.PlatformServices = new MockPlatformServices(); From 29462afe3e0d3e05f85d8b70cd5cea968007574d Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 18:22:35 -0800 Subject: [PATCH 02/34] Add macOS Unit Tests --- azure-pipelines.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a0ee31d07..5b2e23a1e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,6 +13,7 @@ variables: PathToCsproj: 'src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj' PathToMarkupCsproj: 'src/Markup/Xamarin.CommunityToolkit.Markup/Xamarin.CommunityToolkit.Markup.csproj' PathToUnitTestCsproj: 'src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj' + PathToMsBuildOnMacOS: 'mono /Applications/Visual\ studio.app/Contents/Resources/lib/monodevelop/bin/MSBuild/Current/bin/MSBuild.dll' PathToSln: 'samples/XCT.Sample.sln' resources: @@ -193,11 +194,15 @@ jobs: - task: CmdLine@2 displayName: 'Build Solution' inputs: - script: 'mono /Applications/Visual\ studio.app/Contents/Resources/lib/monodevelop/bin/MSBuild/Current/bin/MSBuild.dll $(PathToCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false' + script: '$(PathToMsBuildOnMacOS) $(PathToCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false' + - task: CmdLine@2 + displayName: 'Run Unit Tests' + inputs: + script: 'dotnet test -c Release $(PathToUnitTestCsproj)' - task: CmdLine@2 displayName: 'Pack NuGets' inputs: - script: 'mono /Applications/Visual\ studio.app/Contents/Resources/lib/monodevelop/bin/MSBuild/Current/bin/MSBuild.dll $(PathToCsproj) /p:Configuration=Release /t:Pack /p:PackageVersion=$(NugetPackageVersion) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/nuget"' + script: '$(PathToMsBuildOnMacOS) $(PathToCsproj) /p:Configuration=Release /t:Pack /p:PackageVersion=$(NugetPackageVersion) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/nuget"' - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}: - template: sign-artifacts/jobs/v2.yml@internal-templates From 7fed57351a5ef5c59c04f02f809e0539720344ff Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 18:34:08 -0800 Subject: [PATCH 03/34] Build 'samples/XCT.Sample.sln' on macOS --- azure-pipelines.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5b2e23a1e..593a44ae2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,8 +10,9 @@ variables: NETCORE_TEST_VERSION_3_1: '3.1.x' NETCORE_TEST_VERSION_2_1: '2.1.x' RunPoliCheck: 'false' - PathToCsproj: 'src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj' PathToMarkupCsproj: 'src/Markup/Xamarin.CommunityToolkit.Markup/Xamarin.CommunityToolkit.Markup.csproj' + PathToCommunityToolkitCsproj: 'src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj' + PathToSamplesSln: 'samples/XCT.Sample.sln' PathToUnitTestCsproj: 'src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj' PathToMsBuildOnMacOS: 'mono /Applications/Visual\ studio.app/Contents/Resources/lib/monodevelop/bin/MSBuild/Current/bin/MSBuild.dll' PathToSln: 'samples/XCT.Sample.sln' @@ -98,7 +99,7 @@ jobs: - task: MSBuild@1 displayName: Build Solution inputs: - solution: $(PathToCsproj) + solution: $(PathToCommunityToolkitCsproj) configuration: Release msbuildArguments: '/restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false' - task: CopyFiles@2 @@ -108,7 +109,7 @@ jobs: - task: MSBuild@1 displayName: Pack NuGets inputs: - solution: $(PathToCsproj) + solution: $(PathToCommunityToolkitCsproj) configuration: Release msbuildArguments: '/t:Pack /p:PackageVersion=$(NugetPackageVersion) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/nuget"' - task: MSBuild@1 @@ -194,7 +195,7 @@ jobs: - task: CmdLine@2 displayName: 'Build Solution' inputs: - script: '$(PathToMsBuildOnMacOS) $(PathToCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false' + script: '$(PathToMsBuildOnMacOS) $(PathToSamplesSln) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false' - task: CmdLine@2 displayName: 'Run Unit Tests' inputs: @@ -202,7 +203,7 @@ jobs: - task: CmdLine@2 displayName: 'Pack NuGets' inputs: - script: '$(PathToMsBuildOnMacOS) $(PathToCsproj) /p:Configuration=Release /t:Pack /p:PackageVersion=$(NugetPackageVersion) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/nuget"' + script: '$(PathToMsBuildOnMacOS) $(PathToCommunityToolkitCsproj) /p:Configuration=Release /t:Pack /p:PackageVersion=$(NugetPackageVersion) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/nuget"' - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}: - template: sign-artifacts/jobs/v2.yml@internal-templates From 4562be14f1ad77cc6050734ff5154292f80860eb Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 18:47:27 -0800 Subject: [PATCH 04/34] Restore Unit Test NuGet Packages --- azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 593a44ae2..fd92353e4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -195,11 +195,13 @@ jobs: - task: CmdLine@2 displayName: 'Build Solution' inputs: - script: '$(PathToMsBuildOnMacOS) $(PathToSamplesSln) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false' + script: '$(PathToMsBuildOnMacOS) $(PathToCommunityToolkitCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false' - task: CmdLine@2 displayName: 'Run Unit Tests' inputs: - script: 'dotnet test -c Release $(PathToUnitTestCsproj)' + script: | + nuget restore $(PathToUnitTestCsproj) + dotnet test -c Release $(PathToUnitTestCsproj) - task: CmdLine@2 displayName: 'Pack NuGets' inputs: From bc9b56864ec20fc9cc4d1be19beaec0504ff6cc2 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 18:49:10 -0800 Subject: [PATCH 05/34] Fix YAML formatting --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fd92353e4..131bdf547 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -200,8 +200,8 @@ jobs: displayName: 'Run Unit Tests' inputs: script: | - nuget restore $(PathToUnitTestCsproj) - dotnet test -c Release $(PathToUnitTestCsproj) + nuget restore $(PathToUnitTestCsproj) + dotnet test -c Release $(PathToUnitTestCsproj) - task: CmdLine@2 displayName: 'Pack NuGets' inputs: From 00bfc09db44625ab1569651c50f49e3240bf7b3a Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 18:59:46 -0800 Subject: [PATCH 06/34] Add xunit.runner.console --- azure-pipelines.yml | 4 +--- .../Xamarin.CommunityToolkit.UnitTests.csproj | 6 +++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 131bdf547..48ad3bb9e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -199,9 +199,7 @@ jobs: - task: CmdLine@2 displayName: 'Run Unit Tests' inputs: - script: | - nuget restore $(PathToUnitTestCsproj) - dotnet test -c Release $(PathToUnitTestCsproj) + script: 'dotnet test -c Release $(PathToUnitTestCsproj)' - task: CmdLine@2 displayName: 'Pack NuGets' inputs: diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj index 7433ce06f..12512c07a 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj @@ -6,7 +6,7 @@ - + @@ -17,6 +17,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From 524bc5082d50867c43d96b1dfba1d0b81a34e7a8 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 19:05:18 -0800 Subject: [PATCH 07/34] Use latest stable version of Microsoft.NET.Test.Sdk --- azure-pipelines.yml | 2 +- .../Xamarin.CommunityToolkit.UnitTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48ad3bb9e..64e1a14fd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -160,7 +160,7 @@ jobs: - job: build_macos displayName: Build macOS Library pool: - vmImage: macos-10.15 + vmImage: macos-latest steps: # if this is a tagged build, then update the version number - powershell: | diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj index 12512c07a..01c96fd3d 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj @@ -6,7 +6,7 @@ - + From d2eee34dbee572dc538ddf2e94cf46c76c33d233 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 20:37:24 -0800 Subject: [PATCH 08/34] Fix Unit Tests on macos --- azure-pipelines.yml | 15 +++++++++++++-- .../Xamarin.CommunityToolkit.UnitTests.csproj | 7 ++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 64e1a14fd..5d1603a35 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -160,7 +160,7 @@ jobs: - job: build_macos displayName: Build macOS Library pool: - vmImage: macos-latest + vmImage: macos-10.15 steps: # if this is a tagged build, then update the version number - powershell: | @@ -199,7 +199,18 @@ jobs: - task: CmdLine@2 displayName: 'Run Unit Tests' inputs: - script: 'dotnet test -c Release $(PathToUnitTestCsproj)' + script: | + echo Running Unit Tests on .NET Framework (xUnit does not support `dotnet test` for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline) + '$(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build + + UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` + XUnitConsoleRunnerNet461=`find ~/.nuget/packages/xunit.runner.console/ | grep 461 | grep xunit.console.exe | grep -v config` + + mono "$(XUnitConsoleRunnerNet461)" "($XUnitConsoleRunnerNet461)" + + echo Running Unit Tests on .NET Core + dotnet restore $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="NetCore" + dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="NetCore" - task: CmdLine@2 displayName: 'Pack NuGets' inputs: diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj index 01c96fd3d..dddcd2bfc 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj @@ -1,6 +1,11 @@  - + + netcoreapp2.1;netcoreapp3.1 + false + + + netcoreapp2.1;netcoreapp3.1;net461 false From 768a3823dbefe9680ada66f79b44cb1aad49d640 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 20:40:47 -0800 Subject: [PATCH 09/34] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5d1603a35..c7bedc106 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -200,7 +200,7 @@ jobs: displayName: 'Run Unit Tests' inputs: script: | - echo Running Unit Tests on .NET Framework (xUnit does not support `dotnet test` for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline) + echo Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline) '$(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` From 9ab41ec60cf5670d73512350feb1ad4156afc48a Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 20:45:25 -0800 Subject: [PATCH 10/34] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c7bedc106..1573556f4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -200,7 +200,7 @@ jobs: displayName: 'Run Unit Tests' inputs: script: | - echo Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline) + echo "Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline)" '$(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` From 28db359658a537e8e9db2d551838990cc580b92d Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 20:49:01 -0800 Subject: [PATCH 11/34] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1573556f4..b45492411 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -201,7 +201,7 @@ jobs: inputs: script: | echo "Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline)" - '$(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build + $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` XUnitConsoleRunnerNet461=`find ~/.nuget/packages/xunit.runner.console/ | grep 461 | grep xunit.console.exe | grep -v config` From 687586551e7b6071d10411130d35175b8a886434 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 21:01:16 -0800 Subject: [PATCH 12/34] Add SemaphoreSlim --- .../Internals/BaseCommand.shared.cs | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.shared.cs index 252e6d958..0d1547caa 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.shared.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.shared.cs @@ -1,5 +1,7 @@ using System; using System.ComponentModel; +using System.Threading; +using System.Threading.Tasks; using Xamarin.CommunityToolkit.Helpers; using Xamarin.Forms; @@ -12,9 +14,10 @@ namespace Xamarin.CommunityToolkit.ObjectModel.Internals public abstract partial class BaseCommand { readonly Func canExecute; + readonly SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1, 1); readonly DelegateWeakEventManager weakEventManager = new DelegateWeakEventManager(); - volatile int executionCount; + int executionCount; /// /// Initializes BaseCommand @@ -51,18 +54,11 @@ protected int ExecutionCount get => executionCount; set { - var shouldRaiseCanExecuteChanged = (AllowsMultipleExecutions, executionCount, value) switch - { - (true, _, _) => false, - (false, 0, >0) => true, - (false, >0, 0) => true, - (false, _, _) => false - }; + var previousExecutionCount = executionCount; executionCount = value; - if (shouldRaiseCanExecuteChanged) - RaiseCanExecuteChanged(); + HandleExecutionCountChanged(previousExecutionCount, value).SafeFireAndForget(); } } @@ -95,5 +91,28 @@ public void RaiseCanExecuteChanged() /// [EditorBrowsable(EditorBrowsableState.Never)] public void ChangeCanExecute() => RaiseCanExecuteChanged(); + + async Task HandleExecutionCountChanged(int updatedExecutionCount, int previousExecutionCount) + { + await semaphoreSlim.WaitAsync().ConfigureAwait(true); + + try + { + var shouldRaiseCanExecuteChanged = (AllowsMultipleExecutions, updatedExecutionCount, previousExecutionCount) switch + { + (true, _, _) => false, + (false, 0, > 0) => true, + (false, > 0, 0) => true, + (false, _, _) => false + }; + + if (shouldRaiseCanExecuteChanged) + RaiseCanExecuteChanged(); + } + finally + { + semaphoreSlim.Release(); + } + } } } \ No newline at end of file From e95b738b7270b58f3a1784d68dd17558d3b09317 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 21:14:28 -0800 Subject: [PATCH 13/34] Add `dotnet restore` --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b45492411..621a9908e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -200,12 +200,17 @@ jobs: displayName: 'Run Unit Tests' inputs: script: | + dotnet restore $(PathToUnitTestCsproj) /p:Configuration=Release + echo "Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline)" $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` XUnitConsoleRunnerNet461=`find ~/.nuget/packages/xunit.runner.console/ | grep 461 | grep xunit.console.exe | grep -v config` + echo UnitTestDLLNet461: $(UnitTestDLLNet461) + echo XUnitConsoleRunnerNet461: $(XUnitConsoleRunnerNet461) + mono "$(XUnitConsoleRunnerNet461)" "($XUnitConsoleRunnerNet461)" echo Running Unit Tests on .NET Core From a776a198a86648f1923a4ba79a72aa3691f0fbff Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 21:14:38 -0800 Subject: [PATCH 14/34] Update azure-pipelines.yml --- azure-pipelines.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 621a9908e..f39974d18 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -206,15 +206,14 @@ jobs: $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` - XUnitConsoleRunnerNet461=`find ~/.nuget/packages/xunit.runner.console/ | grep 461 | grep xunit.console.exe | grep -v config` + XUnitConsoleRunnerNet461=`find / | grep 461 | grep xunit.console.exe | grep -v config | head 1` echo UnitTestDLLNet461: $(UnitTestDLLNet461) echo XUnitConsoleRunnerNet461: $(XUnitConsoleRunnerNet461) mono "$(XUnitConsoleRunnerNet461)" "($XUnitConsoleRunnerNet461)" - echo Running Unit Tests on .NET Core - dotnet restore $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="NetCore" + echo "Running Unit Tests on .NET Core" dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="NetCore" - task: CmdLine@2 displayName: 'Pack NuGets' From a2cff284d59b9f24ea9c8fa6b7c16747061337f6 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 21:44:24 -0800 Subject: [PATCH 15/34] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f39974d18..5b01d90fe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -206,7 +206,7 @@ jobs: $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` - XUnitConsoleRunnerNet461=`find / | grep 461 | grep xunit.console.exe | grep -v config | head 1` + XUnitConsoleRunnerNet461=`find / | grep xunit.console.exe | grep -v config` echo UnitTestDLLNet461: $(UnitTestDLLNet461) echo XUnitConsoleRunnerNet461: $(XUnitConsoleRunnerNet461) From 1b1170d011cb547d27bb5f15c321d5e6168e6665 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 21:58:13 -0800 Subject: [PATCH 16/34] Revert "Add SemaphoreSlim" This reverts commit 687586551e7b6071d10411130d35175b8a886434. --- .../Internals/BaseCommand.shared.cs | 39 +++++-------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.shared.cs index 0d1547caa..252e6d958 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.shared.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.shared.cs @@ -1,7 +1,5 @@ using System; using System.ComponentModel; -using System.Threading; -using System.Threading.Tasks; using Xamarin.CommunityToolkit.Helpers; using Xamarin.Forms; @@ -14,10 +12,9 @@ namespace Xamarin.CommunityToolkit.ObjectModel.Internals public abstract partial class BaseCommand { readonly Func canExecute; - readonly SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1, 1); readonly DelegateWeakEventManager weakEventManager = new DelegateWeakEventManager(); - int executionCount; + volatile int executionCount; /// /// Initializes BaseCommand @@ -54,11 +51,18 @@ protected int ExecutionCount get => executionCount; set { - var previousExecutionCount = executionCount; + var shouldRaiseCanExecuteChanged = (AllowsMultipleExecutions, executionCount, value) switch + { + (true, _, _) => false, + (false, 0, >0) => true, + (false, >0, 0) => true, + (false, _, _) => false + }; executionCount = value; - HandleExecutionCountChanged(previousExecutionCount, value).SafeFireAndForget(); + if (shouldRaiseCanExecuteChanged) + RaiseCanExecuteChanged(); } } @@ -91,28 +95,5 @@ public void RaiseCanExecuteChanged() /// [EditorBrowsable(EditorBrowsableState.Never)] public void ChangeCanExecute() => RaiseCanExecuteChanged(); - - async Task HandleExecutionCountChanged(int updatedExecutionCount, int previousExecutionCount) - { - await semaphoreSlim.WaitAsync().ConfigureAwait(true); - - try - { - var shouldRaiseCanExecuteChanged = (AllowsMultipleExecutions, updatedExecutionCount, previousExecutionCount) switch - { - (true, _, _) => false, - (false, 0, > 0) => true, - (false, > 0, 0) => true, - (false, _, _) => false - }; - - if (shouldRaiseCanExecuteChanged) - RaiseCanExecuteChanged(); - } - finally - { - semaphoreSlim.Release(); - } - } } } \ No newline at end of file From 8aafba62b510d9600c1708bcb41ea3ba1a49ebc5 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 22:08:29 -0800 Subject: [PATCH 17/34] Revert BaseCommand.semaphoreSlim --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5b01d90fe..249b5cb10 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -200,13 +200,17 @@ jobs: displayName: 'Run Unit Tests' inputs: script: | + dotnet nuget locals global-packages -l + NuGetGlobalPackagesFolder=`dotnet nuget locals global-packages -l` + echo NuGetGlobalPackagesFolder: $(NuGetGlobalPackagesFolder) + dotnet restore $(PathToUnitTestCsproj) /p:Configuration=Release echo "Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline)" $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` - XUnitConsoleRunnerNet461=`find / | grep xunit.console.exe | grep -v config` + XUnitConsoleRunnerNet461=`find "($NuGetGlobalPackagesFolder)" | grep net461 | grep xunit.console.exe | grep -v config` echo UnitTestDLLNet461: $(UnitTestDLLNet461) echo XUnitConsoleRunnerNet461: $(XUnitConsoleRunnerNet461) From 90a4a574afba7438bb441ede94ab07e549a25870 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 22:13:37 -0800 Subject: [PATCH 18/34] Update azure-pipelines.yml --- azure-pipelines.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 249b5cb10..49437024c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -200,17 +200,13 @@ jobs: displayName: 'Run Unit Tests' inputs: script: | - dotnet nuget locals global-packages -l - NuGetGlobalPackagesFolder=`dotnet nuget locals global-packages -l` - echo NuGetGlobalPackagesFolder: $(NuGetGlobalPackagesFolder) - dotnet restore $(PathToUnitTestCsproj) /p:Configuration=Release echo "Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline)" $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` - XUnitConsoleRunnerNet461=`find "($NuGetGlobalPackagesFolder)" | grep net461 | grep xunit.console.exe | grep -v config` + XUnitConsoleRunnerNet461=`find ~/.nuget/packages/ | grep net461 | grep xunit.console.exe | grep -v config` echo UnitTestDLLNet461: $(UnitTestDLLNet461) echo XUnitConsoleRunnerNet461: $(XUnitConsoleRunnerNet461) From a90ab0cc91b5180533ddb017dd8db89475e13902 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 22:21:31 -0800 Subject: [PATCH 19/34] Update azure-pipelines.yml --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 49437024c..e08d30f77 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -205,6 +205,9 @@ jobs: echo "Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline)" $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build + echo UnitTestDLLNet461 Result: `find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` + echo XUnitConsoleRunnerNet461 Result: `find ~/.nuget/packages/ | grep net461 | grep xunit.console.exe | grep -v config` + UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` XUnitConsoleRunnerNet461=`find ~/.nuget/packages/ | grep net461 | grep xunit.console.exe | grep -v config` From 4e9b25aa69cc87abb6e575f229323bddbb81a0b7 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 22:37:30 -0800 Subject: [PATCH 20/34] Update azure-pipelines.yml --- azure-pipelines.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e08d30f77..d70038785 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -201,20 +201,13 @@ jobs: inputs: script: | dotnet restore $(PathToUnitTestCsproj) /p:Configuration=Release + $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="" /restore /t:Build echo "Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline)" - $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="Any CPU" /restore /t:Build + echo UnitTestDLL for .NET Framework 4.6.1 Result: `find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` + echo XUnit Console Runner for .NET Framework 4.6.1 Result:`find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config` - echo UnitTestDLLNet461 Result: `find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` - echo XUnitConsoleRunnerNet461 Result: `find ~/.nuget/packages/ | grep net461 | grep xunit.console.exe | grep -v config` - - UnitTestDLLNet461=`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` - XUnitConsoleRunnerNet461=`find ~/.nuget/packages/ | grep net461 | grep xunit.console.exe | grep -v config` - - echo UnitTestDLLNet461: $(UnitTestDLLNet461) - echo XUnitConsoleRunnerNet461: $(XUnitConsoleRunnerNet461) - - mono "$(XUnitConsoleRunnerNet461)" "($XUnitConsoleRunnerNet461)" + mono "`find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config`" "`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461`" echo "Running Unit Tests on .NET Core" dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="NetCore" From 596baf125b20387aab49c36f6ad94a1f24a653aa Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 23:10:19 -0800 Subject: [PATCH 21/34] Add ConfigureAwait(false) to ValueTaskDelay(int) --- azure-pipelines.yml | 5 +++-- .../Helpers/LocalizedStringTests/LocalizedStringTests.cs | 4 ++++ .../AsyncValueCommandTests/BaseAsyncValueCommandTests.cs | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d70038785..eb6fef3fe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -204,8 +204,9 @@ jobs: $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="" /restore /t:Build echo "Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline)" - echo UnitTestDLL for .NET Framework 4.6.1 Result: `find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` - echo XUnit Console Runner for .NET Framework 4.6.1 Result:`find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config` + + # UnitTestDLL for .NET Framework 4.6.1 Result: `find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` + # XUnit Console Runner for .NET Framework 4.6.1 Result: `find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config` mono "`find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config`" "`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461`" diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Helpers/LocalizedStringTests/LocalizedStringTests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Helpers/LocalizedStringTests/LocalizedStringTests.cs index ee903096f..c97fa460b 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Helpers/LocalizedStringTests/LocalizedStringTests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Helpers/LocalizedStringTests/LocalizedStringTests.cs @@ -77,6 +77,9 @@ public void LocalizedStringTests_WeekSubscribe_ValidImplementation() Assert.True(isTrigered); } +#if NET461 +#warning Test fails on mono x64 Running on macOS +#else [Fact] public void LocalizedStringTests_Disposed_IfNoReferences() { @@ -97,5 +100,6 @@ void SetLocalizedString() localizedString = new LocalizedString(localizationManager, () => localizationManager[testString]); } } +#endif } } diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs index 064659102..29471cbc4 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs @@ -15,7 +15,7 @@ public abstract class BaseAsyncValueCommandTests : BaseCommandTests protected new ValueTask ParameterImmediateNullReferenceExceptionTask(int delay) => throw new NullReferenceException(); - protected async ValueTask ValueTaskDelay(int delay) => await Task.Delay(delay); + protected async ValueTask ValueTaskDelay(int delay) => await Task.Delay(delay).ConfigureAwait(false); protected new async ValueTask NoParameterDelayedNullReferenceExceptionTask() { From 90c3c97beec1dd58703229673d44a3ff401e3ae2 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 23:13:24 -0800 Subject: [PATCH 22/34] Change Platform from NetCore to macOS --- azure-pipelines.yml | 6 +++--- .../Xamarin.CommunityToolkit.UnitTests.csproj | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eb6fef3fe..12a6ba559 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -203,15 +203,15 @@ jobs: dotnet restore $(PathToUnitTestCsproj) /p:Configuration=Release $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="" /restore /t:Build - echo "Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline)" + echo "********** Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline) **********" # UnitTestDLL for .NET Framework 4.6.1 Result: `find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461` # XUnit Console Runner for .NET Framework 4.6.1 Result: `find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config` mono "`find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config`" "`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461`" - echo "Running Unit Tests on .NET Core" - dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="NetCore" + echo "***** Running Unit Tests on .NET Core *****" + dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="macOS" - task: CmdLine@2 displayName: 'Pack NuGets' inputs: diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj index dddcd2bfc..3f9d87442 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj @@ -1,11 +1,11 @@  - + netcoreapp2.1;netcoreapp3.1 false - + netcoreapp2.1;netcoreapp3.1;net461 false From af4e8db1dcb8c298c3b15d7a056dc5bd8bd02d98 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sat, 13 Mar 2021 23:35:04 -0800 Subject: [PATCH 23/34] Passthrough ValueTask --- azure-pipelines.yml | 2 +- .../AsyncValueCommandTests/BaseAsyncValueCommandTests.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 12a6ba559..12a1a2b7f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -201,7 +201,7 @@ jobs: inputs: script: | dotnet restore $(PathToUnitTestCsproj) /p:Configuration=Release - $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=UnitTest /p:Platform="" /restore /t:Build + $(PathToMsBuildOnMacOS) $(PathToUnitTestCsproj) /p:Configuration=Release /restore /t:Build echo "********** Running Unit Tests on .NET Framework (xUnit does not support dotnet test for .NET Framework: https://xunit.net/docs/getting-started/netfx/cmdline) **********" diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs index 29471cbc4..41594e882 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs @@ -15,7 +15,6 @@ public abstract class BaseAsyncValueCommandTests : BaseCommandTests protected new ValueTask ParameterImmediateNullReferenceExceptionTask(int delay) => throw new NullReferenceException(); - protected async ValueTask ValueTaskDelay(int delay) => await Task.Delay(delay).ConfigureAwait(false); protected new async ValueTask NoParameterDelayedNullReferenceExceptionTask() { @@ -28,5 +27,7 @@ public abstract class BaseAsyncValueCommandTests : BaseCommandTests await Task.Delay(delay); throw new NullReferenceException(); } + + ValueTask ValueTaskDelay(int delay) => new ValueTask(Task.Delay(delay)); } } \ No newline at end of file From d7b284243facc84a5cffff1c3bc86887e7af19f8 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 00:15:45 -0800 Subject: [PATCH 24/34] Update azure-pipelines.yml --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 12a1a2b7f..474acac72 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -211,6 +211,7 @@ jobs: mono "`find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config`" "`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461`" echo "***** Running Unit Tests on .NET Core *****" + echo temp dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="macOS" - task: CmdLine@2 displayName: 'Pack NuGets' From 1a7c7fb1e2e0ad077e5e52069785222f5eed2b62 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 00:18:50 -0800 Subject: [PATCH 25/34] Revert "Update azure-pipelines.yml" This reverts commit d7b284243facc84a5cffff1c3bc86887e7af19f8. --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 474acac72..12a1a2b7f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -211,7 +211,6 @@ jobs: mono "`find ~/.nuget/packages | grep net461 | grep xunit.console.exe | grep -v config`" "`find . -name Xamarin.CommunityToolkit.UnitTests.dll | grep bin | grep 461`" echo "***** Running Unit Tests on .NET Core *****" - echo temp dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="macOS" - task: CmdLine@2 displayName: 'Pack NuGets' From b9f9220b37d368f7672edd155e2f483b965009b2 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 00:27:43 -0800 Subject: [PATCH 26/34] Use ConfigureAwait(false) --- azure-pipelines.yml | 2 +- .../AsyncValueCommandTests/BaseAsyncValueCommandTests.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 12a1a2b7f..afb0a1860 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -134,7 +134,7 @@ jobs: - task: CmdLine@2 displayName: 'Run Unit Tests' inputs: - script: dotnet test $(PathToUnitTestCsproj) -c Release --collect "Code coverage" -p:BuildInParallel=false + script: dotnet test $(PathToUnitTestCsproj) -c Release --collect "Code coverage" # publish the packages - task: PublishBuildArtifacts@1 displayName: 'Publish Unsigned NuGets' diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs index 41594e882..bbd5f3905 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs @@ -15,7 +15,6 @@ public abstract class BaseAsyncValueCommandTests : BaseCommandTests protected new ValueTask ParameterImmediateNullReferenceExceptionTask(int delay) => throw new NullReferenceException(); - protected new async ValueTask NoParameterDelayedNullReferenceExceptionTask() { await Task.Delay(Delay); @@ -28,6 +27,6 @@ public abstract class BaseAsyncValueCommandTests : BaseCommandTests throw new NullReferenceException(); } - ValueTask ValueTaskDelay(int delay) => new ValueTask(Task.Delay(delay)); + async ValueTask ValueTaskDelay(int delay) => await Task.Delay(delay).ConfigureAwait(false); } } \ No newline at end of file From 01ea4a9aa3f183decabf0d1660f91cf497d24931 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 00:47:32 -0800 Subject: [PATCH 27/34] Rename Task --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index afb0a1860..9050c93f7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -97,7 +97,7 @@ jobs: condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/') # restore, build and pack the packages - task: MSBuild@1 - displayName: Build Solution + displayName: Build Xamarin.CommunityToolkit.csproj inputs: solution: $(PathToCommunityToolkitCsproj) configuration: Release From 654db1897a071d5908cb4324d660708cfa7a4414 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 00:59:21 -0800 Subject: [PATCH 28/34] Remove `static` --- .../AsyncValueCommandTests/BaseAsyncValueCommandTests.cs | 2 +- .../ObjectModel/Internals/BaseCommand.netstandard.wpf.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs index bbd5f3905..359dbd0d7 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/ObjectModel/ICommandTests/AsyncValueCommandTests/BaseAsyncValueCommandTests.cs @@ -27,6 +27,6 @@ public abstract class BaseAsyncValueCommandTests : BaseCommandTests throw new NullReferenceException(); } - async ValueTask ValueTaskDelay(int delay) => await Task.Delay(delay).ConfigureAwait(false); + ValueTask ValueTaskDelay(int delay) => new ValueTask(Task.Delay(delay)); } } \ No newline at end of file diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.netstandard.wpf.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.netstandard.wpf.cs index 15af0d09a..ce1eb4a0b 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.netstandard.wpf.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.netstandard.wpf.cs @@ -6,11 +6,11 @@ namespace Xamarin.CommunityToolkit.ObjectModel.Internals { public abstract partial class BaseCommand { - static readonly SynchronizationContext? synchronizationContext = SynchronizationContext.Current; + readonly SynchronizationContext? synchronizationContext = SynchronizationContext.Current; - static bool IsMainThread => SynchronizationContext.Current == synchronizationContext; + bool IsMainThread => SynchronizationContext.Current == synchronizationContext; - static void BeginInvokeOnMainThread(Action action) + void BeginInvokeOnMainThread(Action action) { if (synchronizationContext != null && SynchronizationContext.Current != synchronizationContext) synchronizationContext.Post(_ => action(), null); From a86522a62fce9c20e31c5b0e2818f2bd1cd209ae Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 01:09:57 -0800 Subject: [PATCH 29/34] Remove `static` --- .../ObjectModel/Internals/BaseCommand.gtk.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.gtk.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.gtk.cs index 37ef803e1..264893d13 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.gtk.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/ObjectModel/Internals/BaseCommand.gtk.cs @@ -5,9 +5,9 @@ namespace Xamarin.CommunityToolkit.ObjectModel.Internals { public abstract partial class BaseCommand { - static readonly Thread mainThread = Thread.CurrentThread; + readonly SynchronizationContext? synchronizationContext = SynchronizationContext.Current; - static bool IsMainThread => Thread.CurrentThread == mainThread; + bool IsMainThread => SynchronizationContext.Current == synchronizationContext; static void BeginInvokeOnMainThread(Action action) { From c9224b6de4761a365d446429a67c395ab697ff7c Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 01:28:14 -0800 Subject: [PATCH 30/34] Revert p:BuildInParallel=false --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9050c93f7..2755fac31 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -134,7 +134,7 @@ jobs: - task: CmdLine@2 displayName: 'Run Unit Tests' inputs: - script: dotnet test $(PathToUnitTestCsproj) -c Release --collect "Code coverage" + script: dotnet test $(PathToUnitTestCsproj) -c Release --collect "Code coverage" -p:BuildInParallel=false # publish the packages - task: PublishBuildArtifacts@1 displayName: 'Publish Unsigned NuGets' @@ -193,7 +193,7 @@ jobs: version: $(NETCORE_TEST_VERSION_2_1) includePreviewVersions: false - task: CmdLine@2 - displayName: 'Build Solution' + displayName: 'Build Xamarin.CommunityToolkit.csproj' inputs: script: '$(PathToMsBuildOnMacOS) $(PathToCommunityToolkitCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false' - task: CmdLine@2 From bf93f0ce35788a4d566bab2f35b2a2b53edcfa7c Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 08:55:57 -0700 Subject: [PATCH 31/34] Update azure-pipelines.yml --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2755fac31..981fcd4a4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -212,6 +212,7 @@ jobs: echo "***** Running Unit Tests on .NET Core *****" dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="macOS" + echo temp - task: CmdLine@2 displayName: 'Pack NuGets' inputs: From 031121a87340ffd1679b8ec3a7af0dcfb29b3967 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 09:47:34 -0700 Subject: [PATCH 32/34] Revert "Update azure-pipelines.yml" This reverts commit bf93f0ce35788a4d566bab2f35b2a2b53edcfa7c. --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 981fcd4a4..2755fac31 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -212,7 +212,6 @@ jobs: echo "***** Running Unit Tests on .NET Core *****" dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="macOS" - echo temp - task: CmdLine@2 displayName: 'Pack NuGets' inputs: From 458feb25200794080d2b2d723ce7b3fe43625978 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 11:06:35 -0700 Subject: [PATCH 33/34] Revert "Revert "Update azure-pipelines.yml"" This reverts commit 031121a87340ffd1679b8ec3a7af0dcfb29b3967. --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2755fac31..981fcd4a4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -212,6 +212,7 @@ jobs: echo "***** Running Unit Tests on .NET Core *****" dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="macOS" + echo temp - task: CmdLine@2 displayName: 'Pack NuGets' inputs: From 38fc6ff0976efe669cb9321922d9404ff8a4a98a Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Sun, 14 Mar 2021 11:18:12 -0700 Subject: [PATCH 34/34] Revert "Revert "Revert "Update azure-pipelines.yml""" This reverts commit 458feb25200794080d2b2d723ce7b3fe43625978. --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 981fcd4a4..2755fac31 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -212,7 +212,6 @@ jobs: echo "***** Running Unit Tests on .NET Core *****" dotnet test $(PathToUnitTestCsproj) /p:Configuration=Release /p:Platform="macOS" - echo temp - task: CmdLine@2 displayName: 'Pack NuGets' inputs: