run tests on .NET Core 3.1 (DataDog#601)

.azure-pipelines/integration-tests.yml

@@ -1,9 +1,8 @@
-trigger:
-  batch: 'true'
+trigger: none
+pr:
   branches:
     include:
       - master
-      - develop
   paths:
     exclude:
       - docs/*
@@ -12,8 +11,6 @@ trigger:
 variables:
   buildConfiguration: Debug
   packageFeed: /ffc32c57-3e0e-4e8f-8633-a7ad01df2e45
-  dotnetCoreSdkVersion: 3.0.x
-  dotnetCore21SdkVersion: 2.1.x
   publishOutput: $(Build.SourcesDirectory)/src/bin/managed-publish
 
 jobs:
@@ -22,9 +19,14 @@ jobs:
   strategy:
     matrix:
       netcoreapp2_1:
+        dotnetCoreSdkVersion: 2.1.x
         publishTargetFramework: netcoreapp2.1
       netcoreapp3_0:
+        dotnetCoreSdkVersion: 3.0.x
         publishTargetFramework: netcoreapp3.0
+      netcoreapp3_1:
+        dotnetCoreSdkVersion: 3.1.x
+        publishTargetFramework: netcoreapp3.1
 
   pool:
     vmImage: ubuntu-16.04
@@ -68,10 +70,22 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: install dotnet core 2.1 sdk
+    displayName: install dotnet core sdk 2.1
     inputs:
       packageType: sdk
-      version: $(dotnetCore21SdkVersion)
+      version: 2.1.x
+
+  - task: UseDotNet@2
+    displayName: install dotnet core sdk 3.0
+    inputs:
+      packageType: sdk
+      version: 3.0.x
+
+  - task: UseDotNet@2
+    displayName: install dotnet core sdk 3.1
+    inputs:
+      packageType: sdk
+      version: 3.1.x
 
   - task: DotNetCoreCLI@2
     displayName: dotnet build src/**/*.csproj
@@ -144,14 +158,6 @@ jobs:
       msbuildArguments: '/t:BuildFrameworkReproductions'
       maximumCpuCount: true
 
-  # Install the .NET Core 3.0 SDK and use it from here on out, since it is only
-  # the .NET Core sample apps that require the .NET Core 3.0 SDK
-  - task: UseDotNet@2
-    displayName: install dotnet core 3.0 sdk
-    inputs:
-      packageType: sdk
-      version: $(dotnetCoreSdkVersion)
-
   - task: DotNetCoreCLI@2
     displayName: dotnet restore
     inputs:

.azure-pipelines/packages.yml

@@ -7,7 +7,7 @@ pr: none
 variables:
   buildConfiguration: release
   packageFeed: /ffc32c57-3e0e-4e8f-8633-a7ad01df2e45
-  dotnetCoreSdkVersion: 3.0.x
+  dotnetCoreSdkVersion: 3.1.x
   publishOutput: $(Build.SourcesDirectory)/src/bin/managed-publish
 
 jobs:

.azure-pipelines/unit-tests.yml

@@ -1,8 +1,9 @@
 trigger:
-  batch: 'true'
   branches:
     include:
-      - refs/heads/*
+      - '*'
+    exclude:
+      - refs/pull/*/head
   paths:
     exclude:
       - docs/*
@@ -11,8 +12,6 @@ trigger:
 variables:
   buildConfiguration: Debug
   packageFeed: /ffc32c57-3e0e-4e8f-8633-a7ad01df2e45
-  dotnetCoreSdkVersion: 3.0.x
-  dotnetCore21SdkVersion: 2.1.x
 
 jobs:
 
@@ -29,16 +28,22 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: install dotnet core 2.1 sdk
+    displayName: install dotnet core runtime 2.1
     inputs:
-      packageType: sdk
-      version: $(dotnetCore21SdkVersion)
+      packageType: runtime
+      version: 2.1.x
+
+  - task: UseDotNet@2
+    displayName: install dotnet core runtime 3.0
+    inputs:
+      packageType: runtime
+      version: 3.0.x
 
   - task: UseDotNet@2
-    displayName: install dotnet core 3.0 sdk
+    displayName: install dotnet core sdk 3.1
     inputs:
       packageType: sdk
-      version: $(dotnetCoreSdkVersion)
+      version: 3.1.x
 
   - task: DotNetCoreCLI@2
     displayName: dotnet restore
@@ -77,11 +82,12 @@ jobs:
     vmImage: windows-2019
 
   steps:
+
   - task: UseDotNet@2
-    displayName: install dotnet core 2.1 sdk
+    displayName: install dotnet core sdk 3.1
     inputs:
       packageType: sdk
-      version: $(dotnetCore21SdkVersion)
+      version: 3.1.x
 
   - task: DotNetCoreCLI@2
     displayName: dotnet build

.env

@@ -1,4 +1,4 @@
 # default environment values used by docker-compose
 
 buildConfiguration=Debug
-publishTargetFramework=netcoreapp2.1
+publishTargetFramework=netcoreapp3.1

Datadog.Trace.sln

@@ -70,11 +70,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AspNetMvc5", "sampl
 		{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A} = {C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AspNetCoreMvc2", "samples\Samples.AspNetCoreMvc2\Samples.AspNetCoreMvc2.csproj", "{9951A03A-AD1B-48D8-A96D-B85532BEDADD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{85F35AAF-D102-4960-8B41-3BD9CBD0E77F} = {85F35AAF-D102-4960-8B41-3BD9CBD0E77F}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deploy", "deploy", "{C1B5EA8C-C190-4EAE-871B-A7E95B5EC482}"
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Datadog.Trace.ClrProfiler.WindowsInstaller", "deploy\Datadog.Trace.ClrProfiler.WindowsInstaller\Datadog.Trace.ClrProfiler.WindowsInstaller.wixproj", "{3054DE0E-F140-4758-B2DA-0B9470C6EDE1}"
@@ -100,7 +95,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.ClrProfiler.I
 		{2AD18622-9A02-41B4-915E-798BD64044D5} = {2AD18622-9A02-41B4-915E-798BD64044D5}
 		{3C6DD42E-9214-4747-92BA-78DE29AACE59} = {3C6DD42E-9214-4747-92BA-78DE29AACE59}
 		{43782238-E7BB-49D0-9541-1121DACA6EB5} = {43782238-E7BB-49D0-9541-1121DACA6EB5}
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD} = {9951A03A-AD1B-48D8-A96D-B85532BEDADD}
 		{1A5E9F40-F3A5-4B59-9898-3DCD65C459C3} = {1A5E9F40-F3A5-4B59-9898-3DCD65C459C3}
 		{3493346B-44F6-4F50-8FB4-51D0090DF544} = {3493346B-44F6-4F50-8FB4-51D0090DF544}
 		{F47F206E-4CCA-4AD0-AEBA-FD9F491E05EC} = {F47F206E-4CCA-4AD0-AEBA-FD9F491E05EC}
@@ -274,8 +268,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithLog4Net", "r
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Core.Tools", "tools\Datadog.Core.Tools\Datadog.Core.Tools.csproj", "{3BEACB10-89FE-4F74-8022-1A52F223CE82}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AspNetCoreMvc.Netcore3", "samples\Samples.AspNetCoreMvc.Netcore3\Samples.AspNetCoreMvc.Netcore3.csproj", "{64235C59-8EAB-401A-86B0-C41E513F0AE8}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "performance", "performance", "{CD9D9813-A195-464A-A0F1-59E02D16E181}"
 	ProjectSection(SolutionItems) = preProject
 		performance\Directory.Build.props = performance\Directory.Build.props
@@ -293,6 +285,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.TracingWithoutLimit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.RateLimiter", "samples\Samples.RateLimiter\Samples.RateLimiter.csproj", "{EF718502-7760-45B5-A563-5F1B22A6B840}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AspNetCoreMvc30", "samples\Samples.AspNetCoreMvc30\Samples.AspNetCoreMvc30.csproj", "{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AspNetCoreMvc31", "samples\Samples.AspNetCoreMvc31\Samples.AspNetCoreMvc31.csproj", "{303F8E41-691F-4453-AB7D-88A0036C0465}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AspNetCoreMvc21", "samples\Samples.AspNetCoreMvc21\Samples.AspNetCoreMvc21.csproj", "{D141BD06-DD95-4CAF-85CD-657116E0DAD4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -431,16 +429,6 @@ Global
 		{3C6DD42E-9214-4747-92BA-78DE29AACE59}.Release|x64.Build.0 = Release|x64
 		{3C6DD42E-9214-4747-92BA-78DE29AACE59}.Release|x86.ActiveCfg = Release|x86
 		{3C6DD42E-9214-4747-92BA-78DE29AACE59}.Release|x86.Build.0 = Release|x86
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x64.ActiveCfg = Debug|x64
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x64.Build.0 = Debug|x64
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x86.ActiveCfg = Debug|x86
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x86.Build.0 = Debug|x86
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|Any CPU.ActiveCfg = Release|x64
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x64.ActiveCfg = Release|x64
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x64.Build.0 = Release|x64
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x86.ActiveCfg = Release|x86
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x86.Build.0 = Release|x86
 		{3054DE0E-F140-4758-B2DA-0B9470C6EDE1}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{3054DE0E-F140-4758-B2DA-0B9470C6EDE1}.Debug|x64.ActiveCfg = Debug|x64
 		{3054DE0E-F140-4758-B2DA-0B9470C6EDE1}.Debug|x86.ActiveCfg = Debug|x86
@@ -921,16 +909,6 @@ Global
 		{3BEACB10-89FE-4F74-8022-1A52F223CE82}.Release|x64.Build.0 = Release|Any CPU
 		{3BEACB10-89FE-4F74-8022-1A52F223CE82}.Release|x86.ActiveCfg = Release|Any CPU
 		{3BEACB10-89FE-4F74-8022-1A52F223CE82}.Release|x86.Build.0 = Release|Any CPU
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8}.Debug|x64.ActiveCfg = Debug|x64
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8}.Debug|x64.Build.0 = Debug|x64
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8}.Debug|x86.ActiveCfg = Debug|x86
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8}.Debug|x86.Build.0 = Debug|x86
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8}.Release|Any CPU.ActiveCfg = Release|x86
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8}.Release|x64.ActiveCfg = Release|x64
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8}.Release|x64.Build.0 = Release|x64
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8}.Release|x86.ActiveCfg = Release|x86
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8}.Release|x86.Build.0 = Release|x86
 		{EEA89ACD-CFBB-4F60-A150-74F0A84DF028}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{EEA89ACD-CFBB-4F60-A150-74F0A84DF028}.Debug|x64.ActiveCfg = Debug|x64
 		{EEA89ACD-CFBB-4F60-A150-74F0A84DF028}.Debug|x64.Build.0 = Debug|x64
@@ -995,6 +973,36 @@ Global
 		{EF718502-7760-45B5-A563-5F1B22A6B840}.Release|x64.Build.0 = Release|x64
 		{EF718502-7760-45B5-A563-5F1B22A6B840}.Release|x86.ActiveCfg = Release|x86
 		{EF718502-7760-45B5-A563-5F1B22A6B840}.Release|x86.Build.0 = Release|x86
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Debug|x64.ActiveCfg = Debug|x64
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Debug|x64.Build.0 = Debug|x64
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Debug|x86.ActiveCfg = Debug|x86
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Debug|x86.Build.0 = Debug|x86
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Release|Any CPU.ActiveCfg = Release|x86
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Release|x64.ActiveCfg = Release|x64
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Release|x64.Build.0 = Release|x64
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Release|x86.ActiveCfg = Release|x86
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37}.Release|x86.Build.0 = Release|x86
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Debug|x64.ActiveCfg = Debug|x64
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Debug|x64.Build.0 = Debug|x64
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Debug|x86.ActiveCfg = Debug|x86
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Debug|x86.Build.0 = Debug|x86
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Release|Any CPU.ActiveCfg = Release|x86
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Release|x64.ActiveCfg = Release|x64
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Release|x64.Build.0 = Release|x64
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Release|x86.ActiveCfg = Release|x86
+		{303F8E41-691F-4453-AB7D-88A0036C0465}.Release|x86.Build.0 = Release|x86
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Debug|x64.ActiveCfg = Debug|x64
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Debug|x64.Build.0 = Debug|x64
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Debug|x86.ActiveCfg = Debug|x86
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Debug|x86.Build.0 = Debug|x86
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Release|Any CPU.ActiveCfg = Release|x86
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Release|x64.ActiveCfg = Release|x64
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Release|x64.Build.0 = Release|x64
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Release|x86.ActiveCfg = Release|x86
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1011,7 +1019,6 @@ Global
 		{237A1C92-DE9E-4649-961B-BBB7CF0DFE01} = {8CEC2042-F11C-49F5-A674-2355793B600A}
 		{85F35AAF-D102-4960-8B41-3BD9CBD0E77F} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
 		{3C6DD42E-9214-4747-92BA-78DE29AACE59} = {65DF5743-B7B5-4BC8-8AB5-9DE596AF3FB8}
-		{9951A03A-AD1B-48D8-A96D-B85532BEDADD} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
 		{3054DE0E-F140-4758-B2DA-0B9470C6EDE1} = {C1B5EA8C-C190-4EAE-871B-A7E95B5EC482}
 		{5728056A-51AA-4FF5-AD0C-E86E44E36102} = {8CEC2042-F11C-49F5-A674-2355793B600A}
 		{FDB5C8D0-018D-4FF9-9680-C6A5078F819B} = {FA03944C-2391-4C25-8979-2E078A8CE0DD}
@@ -1059,13 +1066,15 @@ Global
 		{35F581E9-3D7C-4E80-8DFF-D437B0D86710} = {550AE553-2BBB-4021-B55A-137EF31A6B1F}
 		{1C34D970-6081-4EFA-8F2F-5AD2B146AC58} = {641C9C61-53FD-4504-B8D9-84008BDB89D1}
 		{3BEACB10-89FE-4F74-8022-1A52F223CE82} = {5D8E1F81-B820-4736-B797-271B0FE787EE}
-		{64235C59-8EAB-401A-86B0-C41E513F0AE8} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
 		{EEA89ACD-CFBB-4F60-A150-74F0A84DF028} = {550AE553-2BBB-4021-B55A-137EF31A6B1F}
 		{E41C87E9-7339-4FC0-8791-D57752C5BC12} = {CD9D9813-A195-464A-A0F1-59E02D16E181}
 		{D0424A27-4ED4-406E-80D5-2EFDCC53399B} = {65DF5743-B7B5-4BC8-8AB5-9DE596AF3FB8}
 		{B34EDBC7-C5FB-409D-8472-BC7469D6F2BD} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
 		{8BDF1DE0-E6DE-48AD-AAA3-CE09CB544E2C} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
 		{EF718502-7760-45B5-A563-5F1B22A6B840} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
+		{8B457E8F-8716-4F29-BBE2-DD6C7BC4AC37} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
+		{303F8E41-691F-4453-AB7D-88A0036C0465} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
+		{D141BD06-DD95-4CAF-85CD-657116E0DAD4} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}

PackageVersionsComprehensive.g.props

@@ -102,6 +102,9 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
     <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
       <Properties>ApiVersion=2.9.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
     </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.MongoDB.csproj">
+      <Properties>ApiVersion=2.10.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
     <PackageVersionSample Include="samples*\**\Samples.Elasticsearch.csproj">
       <Properties>ApiVersion=6.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
     </PackageVersionSample>
@@ -228,6 +231,9 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
     <PackageVersionSample Include="samples*\**\Samples.Npgsql.csproj">
       <Properties>ApiVersion=4.1.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
     </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.Npgsql.csproj">
+      <Properties>ApiVersion=4.1.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
     <PackageVersionSample Include="samples*\**\Samples.SqlServer.csproj">
       <Properties>ApiVersion=4.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
     </PackageVersionSample>
@@ -264,6 +270,9 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
     <PackageVersionSample Include="samples*\**\Samples.SqlServer.csproj">
       <Properties>ApiVersion=4.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
     </PackageVersionSample>
+    <PackageVersionSample Include="samples*\**\Samples.SqlServer.csproj">
+      <Properties>ApiVersion=4.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
+    </PackageVersionSample>
     <PackageVersionSample Include="samples*\**\Samples.StackExchange.Redis.csproj">
       <Properties>ApiVersion=1.0.187;RestoreRecursive=false;BuildProjectReferences=false</Properties>
     </PackageVersionSample>
@@ -516,45 +525,8 @@ NOTE:  This code was generated by the GeneratePackageVersions tool. To safely
     <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.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
-      <TargetFramework>netcoreapp2.1</TargetFramework>
-    </PackageVersionSample>
-    <PackageVersionSample Include="samples*\**\Samples.AspNetCoreMvc2.csproj">
-      <Properties>ApiVersion=2.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
-      <TargetFramework>netcoreapp2.1</TargetFramework>
-    </PackageVersionSample>
-    <PackageVersionSample Include="samples*\**\Samples.AspNetCoreMvc2.csproj">
-      <Properties>ApiVersion=2.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
-      <TargetFramework>netcoreapp2.1</TargetFramework>
-    </PackageVersionSample>
-    <PackageVersionSample Include="samples*\**\Samples.AspNetCoreMvc2.csproj">
-      <Properties>ApiVersion=2.0.3;RestoreRecursive=false;BuildProjectReferences=false</Properties>
-      <TargetFramework>netcoreapp2.1</TargetFramework>
-    </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.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
-      <TargetFramework>netcoreapp2.1</TargetFramework>
-    </PackageVersionSample>
-    <PackageVersionSample Include="samples*\**\Samples.AspNetCoreMvc2.csproj">
-      <Properties>ApiVersion=2.1.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
-      <TargetFramework>netcoreapp2.1</TargetFramework>
-    </PackageVersionSample>
-    <PackageVersionSample Include="samples*\**\Samples.AspNetCoreMvc2.csproj">
-      <Properties>ApiVersion=2.1.2;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 Include="samples*\**\Samples.ServiceStack.Redis.csproj">
+      <Properties>ApiVersion=5.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
     </PackageVersionSample>
   </ItemGroup>
 </Project>

PackageVersionsGeneratorDefinitions.json

@@ -47,13 +47,5 @@
     "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"
   }
 ]