Reduce permutations of minors in package versions tool (DataDog#545)

* Reduce number of versions tested on every CI run, add flag for all versions if needed.
pjanotti · Nov 11, 2019 · e0ed460 · e0ed460
1 parent bc2136e
commit e0ed460
Show file tree

Hide file tree

Showing 13 changed files with 864 additions and 352 deletions.
diff --git a/Datadog.Trace.proj b/Datadog.Trace.proj
@@ -17,7 +17,8 @@
     <FrameworkReproduction Include="reproductions\EntityFramework6x.MdTokenLookupFailure\EntityFramework6x.MdTokenLookupFailure.csproj" />
   </ItemGroup>
 
-  <Import Project="PackageVersions.g.props" />
+  <Import Condition="'$(PerformComprehensiveTesting)'=='true'" Project="PackageVersionsComprehensive.g.props" />
+  <Import Condition="'$(PerformComprehensiveTesting)'!='true'" Project="PackageVersionsLatestMinors.g.props" />
 
   <Target Name="Restore">
     <MSBuild Targets="Restore" Projects="@(CsharpProject);@(CsharpTestProject);@(CppProject);@(CppTestProject);@(SampleProject)"/>

diff --git a/PackageVersions.g.props → PackageVersionsComprehensive.g.props b/PackageVersions.g.props → PackageVersionsComprehensive.g.props
@@ -99,6 +99,9 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
     <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
       <Properties>ApiVersion=2.9.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
     </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
     <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
       <Properties>ApiVersion=6.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
     </PackageVersionSample>

diff --git a/PackageVersionsGeneratorDefinitions.json b/PackageVersionsGeneratorDefinitions.json
@@ -1,59 +1,59 @@
 [
-    {
-        "IntegrationName": "MongoDB",
-        "SampleProjectName": "Samples.MongoDB",
-        "NugetPackageSearchName": "MongoDB.Driver",
-        "MinVersion": "2.0.0",
-        "MaxVersionExclusive": "3.0.0"
-    },
-    {
-        "IntegrationName": "ElasticSearch6",
-        "SampleProjectName": "Samples.Elasticsearch",
-        "NugetPackageSearchName": "Elasticsearch.Net",
-        "MinVersion": "6.0.0",
-        "MaxVersionExclusive": "7.0.0"
-    },
-    {
-        "IntegrationName": "ElasticSearch5",
-        "SampleProjectName": "Samples.Elasticsearch.V5",
-        "NugetPackageSearchName": "Elasticsearch.Net",
-        "MinVersion": "5.3.0",
-        "MaxVersionExclusive": "6.0.0"
-    },
-    {
-        "IntegrationName": "Npgsql",
-        "SampleProjectName": "Samples.Npgsql",
-        "NugetPackageSearchName": "Npgsql",
-        "MinVersion": "4.0.0",
-        "MaxVersionExclusive": "5.0.0"
-    },
-    {
-        "IntegrationName": "SqlClient",
-        "SampleProjectName": "Samples.SqlServer",
-        "NugetPackageSearchName": "System.Data.SqlClient",
-        "MinVersion": "4.1.0",
-        "MaxVersionExclusive": "5.0.0"
-    },
-    {
-        "IntegrationName": "StackExchangeRedis",
-        "SampleProjectName": "Samples.StackExchange.Redis",
-        "NugetPackageSearchName": "StackExchange.Redis",
-        "MinVersion": "1.0.187",
-        "MaxVersionExclusive": "2.0.0"
-    },
-    {
-        "IntegrationName": "ServiceStackRedis",
-        "SampleProjectName": "Samples.ServiceStack.Redis",
-        "NugetPackageSearchName": "ServiceStack.Redis",
-        "MinVersion": "4.0.48",
-        "MaxVersionExclusive": "6.0.0"
-    },
-    {
-        "IntegrationName": "AspNetCoreMvc2",
-        "SampleProjectName": "Samples.AspNetCoreMvc2",
-        "SampleTargetFramework": "netcoreapp2.1",
-        "NugetPackageSearchName": "Microsoft.AspNetCore.Mvc",
-        "MinVersion": "2.0.0",
-        "MaxVersionExclusive": "3.0.0"
-    }
+  {
+    "IntegrationName": "MongoDB",
+    "SampleProjectName": "Samples.MongoDB",
+    "NugetPackageSearchName": "MongoDB.Driver",
+    "MinVersion": "2.0.0",
+    "MaxVersionExclusive": "3.0.0"
+  },
+  {
+    "IntegrationName": "ElasticSearch6",
+    "SampleProjectName": "Samples.Elasticsearch",
+    "NugetPackageSearchName": "Elasticsearch.Net",
+    "MinVersion": "6.0.0",
+    "MaxVersionExclusive": "7.0.0"
+  },
+  {
+    "IntegrationName": "ElasticSearch5",
+    "SampleProjectName": "Samples.Elasticsearch.V5",
+    "NugetPackageSearchName": "Elasticsearch.Net",
+    "MinVersion": "5.3.0",
+    "MaxVersionExclusive": "6.0.0"
+  },
+  {
+    "IntegrationName": "Npgsql",
+    "SampleProjectName": "Samples.Npgsql",
+    "NugetPackageSearchName": "Npgsql",
+    "MinVersion": "4.0.0",
+    "MaxVersionExclusive": "5.0.0"
+  },
+  {
+    "IntegrationName": "SqlClient",
+    "SampleProjectName": "Samples.SqlServer",
+    "NugetPackageSearchName": "System.Data.SqlClient",
+    "MinVersion": "4.1.0",
+    "MaxVersionExclusive": "5.0.0"
+  },
+  {
+    "IntegrationName": "StackExchangeRedis",
+    "SampleProjectName": "Samples.StackExchange.Redis",
+    "NugetPackageSearchName": "StackExchange.Redis",
+    "MinVersion": "1.0.187",
+    "MaxVersionExclusive": "2.0.0"
+  },
+  {
+    "IntegrationName": "ServiceStackRedis",
+    "SampleProjectName": "Samples.ServiceStack.Redis",
+    "NugetPackageSearchName": "ServiceStack.Redis",
+    "MinVersion": "4.0.48",
+    "MaxVersionExclusive": "6.0.0"
+  },
+  {
+    "IntegrationName": "AspNetCoreMvc2",
+    "SampleProjectName": "Samples.AspNetCoreMvc2",
+    "SampleTargetFramework": "netcoreapp2.1",
+    "NugetPackageSearchName": "Microsoft.AspNetCore.Mvc",
+    "MinVersion": "2.0.0",
+    "MaxVersionExclusive": "3.0.0"
+  }
 ]
diff --git a/PackageVersionsLatestMinors.g.props b/PackageVersionsLatestMinors.g.props
@@ -0,0 +1,157 @@
+<!--
+***********************************************************************************************
+PackageVersions.g.props
+
+NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
+       modify this file, edit PackageVersionsGeneratorDefinitions.json and
+       re-run the GeneratePackageVersions project in Visual Studio. See the
+       launchSettings.json for the project if you would like to run the tool
+       with the correct arguments outside of Visual Studio.
+
+***********************************************************************************************
+-->
+<Project>
+  <ItemGroup>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.1.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.2.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.4.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.5.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.7.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.8.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
+      <Properties>ApiVersion=6.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
+      <Properties>ApiVersion=6.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
+      <Properties>ApiVersion=6.2.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
+      <Properties>ApiVersion=6.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
+      <Properties>ApiVersion=6.4.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
+      <Properties>ApiVersion=6.5.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
+      <Properties>ApiVersion=6.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
+      <Properties>ApiVersion=6.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
+      <Properties>ApiVersion=6.8.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.V5.csproj">
+      <Properties>ApiVersion=5.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.V5.csproj">
+      <Properties>ApiVersion=5.4.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.V5.csproj">
+      <Properties>ApiVersion=5.5.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.V5.csproj">
+      <Properties>ApiVersion=5.6.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Npgsql.csproj">
+      <Properties>ApiVersion=4.0.10;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Npgsql.csproj">
+      <Properties>ApiVersion=4.1.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.SqlServer.csproj">
+      <Properties>ApiVersion=4.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.SqlServer.csproj">
+      <Properties>ApiVersion=4.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.SqlServer.csproj">
+      <Properties>ApiVersion=4.4.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.SqlServer.csproj">
+      <Properties>ApiVersion=4.5.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.SqlServer.csproj">
+      <Properties>ApiVersion=4.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.SqlServer.csproj">
+      <Properties>ApiVersion=4.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.StackExchange.Redis.csproj">
+      <Properties>ApiVersion=1.0.488;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.StackExchange.Redis.csproj">
+      <Properties>ApiVersion=1.1.608;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.StackExchange.Redis.csproj">
+      <Properties>ApiVersion=1.2.6;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.ServiceStack.Redis.csproj">
+      <Properties>ApiVersion=4.0.62;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.ServiceStack.Redis.csproj">
+      <Properties>ApiVersion=4.5.14;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.ServiceStack.Redis.csproj">
+      <Properties>ApiVersion=5.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.ServiceStack.Redis.csproj">
+      <Properties>ApiVersion=5.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.ServiceStack.Redis.csproj">
+      <Properties>ApiVersion=5.2.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.ServiceStack.Redis.csproj">
+      <Properties>ApiVersion=5.4.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.ServiceStack.Redis.csproj">
+      <Properties>ApiVersion=5.5.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.ServiceStack.Redis.csproj">
+      <Properties>ApiVersion=5.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.ServiceStack.Redis.csproj">
+      <Properties>ApiVersion=5.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.AspNetCoreMvc2.csproj">
+      <Properties>ApiVersion=2.0.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp2.1</TargetFramework>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.AspNetCoreMvc2.csproj">
+      <Properties>ApiVersion=2.1.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp2.1</TargetFramework>
+    </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.AspNetCoreMvc2.csproj">
+      <Properties>ApiVersion=2.2.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+      <TargetFramework>netcoreapp2.1</TargetFramework>
+    </PackageVersionSample>
+  </ItemGroup>
+</Project>
diff --git a/Test.Common.props b/Test.Common.props
@@ -14,7 +14,9 @@
     <ProfilerOutputDirectory>$(MSBuildThisFileDirectory)\src\Datadog.Trace.ClrProfiler.Native\bin\$(Configuration)\$(Platform)</ProfilerOutputDirectory>
     <ManagedProfilerOutputDirectory Condition="'$(ManagedProfilerOutputDirectory)' == ''">$(MSBuildThisFileDirectory)\src\Datadog.Trace.ClrProfiler.Managed\bin\$(Configuration)</ManagedProfilerOutputDirectory>
 
+    <!--These should be consolidated in a file that can be shared for the tests and samples directories -->
     <DefineConstants Condition="'$(BuildingInsideVisualStudio)'=='true' or '$(TestAllPackageVersions)'!='true'">$(DefineConstants);DEFAULT_SAMPLES</DefineConstants>
+    <DefineConstants Condition="'$(PerformComprehensiveTesting)'=='true'">$(DefineConstants);COMPREHENSIVE_TESTS</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(ExcludeManagedProfiler)' != 'true' and

diff --git a/...adog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj b/...adog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj
@@ -2,18 +2,15 @@
 
   <PropertyGroup>
     <Platforms>x64;x86</Platforms>
+
+    <!--These should be consolidated in a file that can be shared for the tests and samples directories -->
     <DefineConstants Condition="'$(BuildingInsideVisualStudio)'=='true' or '$(TestAllPackageVersions)'!='true'">$(DefineConstants);DEFAULT_SAMPLES</DefineConstants>
+    <DefineConstants Condition="'$(PerformComprehensiveTesting)'=='true'">$(DefineConstants);COMPREHENSIVE_TESTS</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\src\Datadog.Trace.ClrProfiler.Native\bin\$(Configuration)\$(Platform)\**"
-             CopyToOutputDirectory="Always"
-             CopyToPublishDirectory="Always"
-             Link="profiler-lib\%(RecursiveDir)\%(Filename)%(Extension)" />
-    <Content Include="..\..\integrations.json"
-             CopyToOutputDirectory="Always"
-             CopyToPublishDirectory="Always"
-             Link="profiler-lib\integrations.json" />
+    <None Include="..\..\src\Datadog.Trace.ClrProfiler.Native\bin\$(Configuration)\$(Platform)\**" CopyToOutputDirectory="Always" CopyToPublishDirectory="Always" Link="profiler-lib\%(RecursiveDir)\%(Filename)%(Extension)" />
+    <Content Include="..\..\integrations.json" CopyToOutputDirectory="Always" CopyToPublishDirectory="Always" Link="profiler-lib\integrations.json" />
   </ItemGroup>
 
   <ItemGroup>