Disable AppVeyor integration

AndreyAkinshin · AndreyAkinshin · commit 28a19697c527 · 2023-07-07T23:26:18.000+02:00
diff --git a/README.md b/README.md
@@ -289,7 +289,6 @@ You will avoid common pitfalls, control the accuracy of your measurements, and i
 | Azure Pipelines | Windows | [![Azure Windows](https://dev.azure.com/dotnet/BenchmarkDotNet/_apis/build/status/BenchmarkDotNet%20-%20Windows)](https://dev.azure.com/dotnet/BenchmarkDotNet/_build/latest?definitionId=55) |
 | Azure Pipelines | Ubuntu  | [![Azure Ubuntu](https://dev.azure.com/dotnet/BenchmarkDotNet/_apis/build/status/BenchmarkDotNet%20-%20Ubuntu)](https://dev.azure.com/dotnet/BenchmarkDotNet/_build/latest?definitionId=56) |
 | Azure Pipelines | macOS | [![Azure macOS](https://dev.azure.com/dotnet/BenchmarkDotNet/_apis/build/status/BenchmarkDotNet%20-%20macOS)](https://dev.azure.com/dotnet/BenchmarkDotNet/_build/latest?definitionId=57) |
-| AppVeyor | Windows | [![AppVeyor/Windows](https://img.shields.io/appveyor/ci/dotnetfoundation/benchmarkdotnet/master.svg)](https://ci.appveyor.com/project/dotnetfoundation/benchmarkdotnet/branch/master) |
 | GitHub Actions | * | [![GitHub Actions](https://github.com/dotnet/BenchmarkDotNet/actions/workflows/build.yaml/badge.svg)](https://github.com/dotnet/BenchmarkDotNet/actions/workflows/build.yaml) |
 
 ## Contributions are welcome!
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/build/BenchmarkDotNet.Build/BuildContext.cs b/build/BenchmarkDotNet.Build/BuildContext.cs
@@ -7,7 +7,6 @@
 using BenchmarkDotNet.Build.Runners;
 using Cake.Common;
 using Cake.Common.Build;
-using Cake.Common.Build.AppVeyor;
 using Cake.Common.Diagnostics;
 using Cake.Common.IO;
 using Cake.Common.Tools.DotNet;
@@ -38,16 +37,7 @@ public class BuildContext : FrostingContext
     public DotNetMSBuildSettings MsBuildSettingsBuild { get; }
     public DotNetMSBuildSettings MsBuildSettingsPack { get; }
 
-    private IAppVeyorProvider AppVeyor => this.BuildSystem().AppVeyor;
-    public bool IsRunningOnAppVeyor => AppVeyor.IsRunningOnAppVeyor;
-    public bool IsOnAppVeyorAndNotPr => IsRunningOnAppVeyor && !AppVeyor.Environment.PullRequest.IsPullRequest;
-
-    public bool IsOnAppVeyorAndBdnNightlyCiCd => IsOnAppVeyorAndNotPr &&
-                                                 AppVeyor.Environment.Repository.Branch == "master" &&
-                                                 this.IsRunningOnWindows();
-
-    public bool IsLocalBuild => this.BuildSystem().IsLocalBuild;
-    public bool IsCiBuild => !this.BuildSystem().IsLocalBuild;
+    private bool IsCiBuild => !this.BuildSystem().IsLocalBuild;
 
     public VersionHistory VersionHistory { get; }
 
diff --git a/build/BenchmarkDotNet.Build/Program.cs b/build/BenchmarkDotNet.Build/Program.cs
@@ -43,8 +43,7 @@ public class UnitTestsTask : FrostingTask<BuildContext>
 [IsDependentOn(typeof(BuildTask))]
 public class InTestsFullTask : FrostingTask<BuildContext>
 {
-    public override bool ShouldRun(BuildContext context) =>
-        context.IsRunningOnWindows() && !context.IsRunningOnAppVeyor;
+    public override bool ShouldRun(BuildContext context) => context.IsRunningOnWindows();
 
     public override void Run(BuildContext context) => context.UnitTestRunner.RunInTests("net462");
 }
diff --git a/build/common.props b/build/common.props
@@ -38,12 +38,11 @@
 
   <PropertyGroup Condition=" '$(VersionPrefix)' == '' ">
     <VersionPrefix>0.13.5</VersionPrefix>
-    <VersionPrefix Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(VersionPrefix).$(APPVEYOR_BUILD_NUMBER)</VersionPrefix>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(VersionSuffix)' == '' AND '$(APPVEYOR_BUILD_NUMBER)' == '' ">
+  <PropertyGroup Condition=" '$(VersionSuffix)' == '' ">
     <VersionSuffix>develop</VersionSuffix>
-    <VersionSuffix Condition=" '$(APPVEYOR_BUILD_NUMBER)' == '' AND '$(BDN_CI_BUILD)' != '' ">ci</VersionSuffix>
+    <VersionSuffix Condition=" '$(BDN_CI_BUILD)' != '' ">ci</VersionSuffix>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/build/uploadtests.ps1 b/build/uploadtests.ps1
diff --git a/docs/_changelog/header/v0.13.0.md b/docs/_changelog/header/v0.13.0.md
@@ -257,16 +257,6 @@ IConfig after = ManualConfig.CreateMinimumViable();
 
 In [#1659](https://github.com/dotnet/BenchmarkDotNet/pull/1659/) [@workgroupengineering](https://github.com/workgroupengineering) added the possibility to indicate the source of the tested nuget package and whether it is a pre-release version.
 
-```cs
-IConfig config = DefaultConfig.Instance
-    .AddJob(Job.Default
-        .WithNuGet("BenchmarkDotNet", "0.13.0", new Uri("https://api.nuget.org/v3/index.json"))
-        .WithId("0.13.0"))
-    .AddJob(Job.Default
-        .WithNuGet("BenchmarkDotNet", "0.12.1.1534", new Uri("https://ci.appveyor.com/nuget/benchmarkdotnet"), prerelease: true)
-        .WithId("0.12.1.1534"));
-```
-
 ### Deterministic benchmark builds
 
 BenchmarkDotNet is now always enforcing Deterministic builds ([#1489](https://github.com/dotnet/BenchmarkDotNet/pull/1489)) and Optimizations enabled ([#1494](https://github.com/dotnet/BenchmarkDotNet/pull/1494)) which is a must-have if you are using custom build configurations. MSBuild enforces optimizations **only** for configurations that are named `Release` (the comparison is case-insensitive).
diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkSwitcherTest.cs b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkSwitcherTest.cs
@@ -289,9 +289,6 @@ public void WhenJobIsDefinedViaAttributeAndArgumentsDontContainJobArgumentOnlySi
         [Fact]
         public void JobNotDefinedButStillBenchmarkIsExecuted()
         {
-            if (ContinuousIntegration.IsAppVeyorOnWindows())
-                return; // timeouts
-
             var types = new[] { typeof(JustBenchmark) };
             var switcher = new BenchmarkSwitcher(types);
             MockExporter mockExporter = new MockExporter();
diff --git a/tests/BenchmarkDotNet.IntegrationTests/ContinuousIntegration.cs b/tests/BenchmarkDotNet.IntegrationTests/ContinuousIntegration.cs
@@ -7,14 +7,9 @@ internal static class ContinuousIntegration
     {
         private static bool IsGitHubActions() => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTION"));
 
-        private static bool IsAppVeyor() => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPVEYOR"));
-
         internal static bool IsGitHubActionsOnWindows()
             => RuntimeInformation.IsWindows() && IsGitHubActions();
 
-        internal static bool IsAppVeyorOnWindows()
-            => RuntimeInformation.IsWindows() && IsAppVeyor();
-
-        internal static bool IsLocalRun() => !IsGitHubActions() && !IsAppVeyor();
+        internal static bool IsLocalRun() => !IsGitHubActions();
     }
 }
diff --git a/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs
@@ -18,9 +18,6 @@ public CustomBuildConfigurationTests(ITestOutputHelper output) : base(output)
         [Fact]
         public void UserCanSpecifyCustomBuildConfiguration()
         {
-            if (ContinuousIntegration.IsAppVeyorOnWindows())
-                return; // timeouts
-
             var jobWithCustomConfiguration = Job.Dry.WithCustomBuildConfiguration("CUSTOM");
 
             var config = CreateSimpleConfig(job: jobWithCustomConfiguration);
diff --git a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs
@@ -75,8 +75,6 @@ public void MemoryDiagnoserSupportsNativeAOT()
         {
             if (RuntimeInformation.IsMacOS())
                 return; // currently not supported
-            if (ContinuousIntegration.IsAppVeyorOnWindows())
-                return; // timeouts
 
             MemoryDiagnoserIsAccurate(
                 NativeAotToolchain.CreateBuilder()
@@ -87,9 +85,6 @@ public void MemoryDiagnoserSupportsNativeAOT()
         [FactDotNetCoreOnly("We don't want to test MonoVM twice (for .NET Framework 4.6.2 and .NET 7.0)")]
         public void MemoryDiagnoserSupportsModernMono()
         {
-            if (ContinuousIntegration.IsAppVeyorOnWindows())
-                return; // timeouts
-
             MemoryDiagnoserIsAccurate(MonoToolchain.Mono70);
         }
 
diff --git a/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs
@@ -13,9 +13,6 @@ public class MonoTests : BenchmarkTestExecutor
         [FactDotNetCoreOnly("UseMonoRuntime option is available in .NET Core only starting from .NET 6")]
         public void Mono70IsSupported()
         {
-            if (ContinuousIntegration.IsAppVeyorOnWindows())
-                return; // timeouts
-
             var config = ManualConfig.CreateEmpty().AddJob(Job.Dry.WithRuntime(MonoRuntime.Mono70));
             CanExecute<MonoBenchmark>(config);
         }
diff --git a/tests/BenchmarkDotNet.IntegrationTests/NativeAotTests.cs b/tests/BenchmarkDotNet.IntegrationTests/NativeAotTests.cs
@@ -22,8 +22,6 @@ public void LatestNativeAotVersionIsSupported()
                 return;
             if (ContinuousIntegration.IsGitHubActionsOnWindows()) // no native dependencies installed
                 return;
-            if (ContinuousIntegration.IsAppVeyorOnWindows())
-                return; // timeouts
             if (RuntimeInformation.IsMacOS())
                 return; // currently not supported
 
diff --git a/tests/BenchmarkDotNet.IntegrationTests/RunStrategyTests.cs b/tests/BenchmarkDotNet.IntegrationTests/RunStrategyTests.cs
@@ -19,9 +19,6 @@ public RunStrategyTests(ITestOutputHelper output) : base(output) { }
         [Fact]
         public void RunStrategiesAreSupported()
         {
-            if (ContinuousIntegration.IsAppVeyorOnWindows())
-                return; // timeouts
-
             var config = ManualConfig.CreateEmpty()
                 .AddColumnProvider(DefaultColumnProviders.Instance)
                 .AddLogger(new OutputLogger(Output))
diff --git a/tests/BenchmarkDotNet.IntegrationTests/ThreadingDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/ThreadingDiagnoserTests.cs
@@ -32,8 +32,7 @@ public static IEnumerable<object[]> GetToolchains()
             yield return new object[] { Job.Default.GetToolchain() };
 
             if (!ContinuousIntegration.IsGitHubActionsOnWindows() // no native dependencies
-                && !RuntimeInformation.IsMacOS() // currently not supported
-                && !ContinuousIntegration.IsAppVeyorOnWindows()) // timeouts
+                && !RuntimeInformation.IsMacOS()) // currently not supported
             {
                 yield return new object[]{ NativeAotToolchain.CreateBuilder()
                     .UseNuGet("7.0.0", "https://api.nuget.org/v3/index.json")

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,7 @@ public class UnitTestsTask : FrostingTask<BuildContext>`
`43`	`43`	`[IsDependentOn(typeof(BuildTask))]`
`44`	`44`	`public class InTestsFullTask : FrostingTask<BuildContext>`
`45`	`45`	`{`
`46`		`- public override bool ShouldRun(BuildContext context) =>`
`47`		`- context.IsRunningOnWindows() && !context.IsRunningOnAppVeyor;`
	`46`	`+ public override bool ShouldRun(BuildContext context) => context.IsRunningOnWindows();`
`48`	`47`
`49`	`48`	`public override void Run(BuildContext context) => context.UnitTestRunner.RunInTests("net462");`
`50`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,9 @@ internal static class ContinuousIntegration`
`7`	`7`	`{`
`8`	`8`	`private static bool IsGitHubActions() => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTION"));`
`9`	`9`
`10`		`- private static bool IsAppVeyor() => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPVEYOR"));`
`11`		`-`
`12`	`10`	`internal static bool IsGitHubActionsOnWindows()`
`13`	`11`	`=> RuntimeInformation.IsWindows() && IsGitHubActions();`
`14`	`12`
`15`		`- internal static bool IsAppVeyorOnWindows()`
`16`		`- => RuntimeInformation.IsWindows() && IsAppVeyor();`
`17`		`-`
`18`		`- internal static bool IsLocalRun() => !IsGitHubActions() && !IsAppVeyor();`
	`13`	`+ internal static bool IsLocalRun() => !IsGitHubActions();`
`19`	`14`	`}`
`20`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,6 @@ public CustomBuildConfigurationTests(ITestOutputHelper output) : base(output)`
`18`	`18`	`[Fact]`
`19`	`19`	`public void UserCanSpecifyCustomBuildConfiguration()`
`20`	`20`	`{`
`21`		`- if (ContinuousIntegration.IsAppVeyorOnWindows())`
`22`		`- return; // timeouts`
`23`		`-`
`24`	`21`	`var jobWithCustomConfiguration = Job.Dry.WithCustomBuildConfiguration("CUSTOM");`
`25`	`22`
`26`	`23`	`var config = CreateSimpleConfig(job: jobWithCustomConfiguration);`