Change dotnet core version for test projects to 3.1 (#1271)

* Change dotnet core version for test projects to 3.1 * change yaml files to point to 3.1
2020-03-16 15:13:55 -07:00 · 2020-03-16 15:13:55 -07:00 · 9d7f2b9735
--- a/build.ps1
+++ b/build.ps1
@ -21,7 +21,7 @@ Parameters:
    -stresstests: Runs Stress tests.
    -publish: (Internal use, requires nuget toolset) Publishes the nuget packages.
    -verbosity: Sets the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic].
-    -framework: Select which framework to run tests on. Allowed values examples include, but are not limited to, "netcoreapp2.1", "net47", "net451"
+    -framework: Select which framework to run tests on. Allowed values examples include, but are not limited to, "netcoreapp3.1", "net47", "net451"
    -skipIotHubTests: Provide this flag if you want to skip all IoT Hub integration tests
    -skipDPSTests: Provide this flag if you want to skip all DPS integration tests
 	
@ -184,7 +184,7 @@ Function RunTests($message, $framework = "*", $filterTestCategory = "*")
    }
 }

-Function RunApp($path, $message, $framework = "netcoreapp2.1")
+Function RunApp($path, $message, $framework = "netcoreapp3.1")
 {
    $label = "RUN: --- $message $configuration ---"

--- a/e2e/test/E2ETests.csproj
+++ b/e2e/test/E2ETests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net472;net451</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net472;net451</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1</TargetFrameworks>
    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    <IsPackable>false</IsPackable>
    <RootNamespace>Microsoft.Azure.Devices.E2ETests</RootNamespace>
@ -134,7 +134,7 @@
      <Version>16.5.132</Version>
    </PackageReference>
  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
    <PackageReference Include="Microsoft.VisualStudio.Threading">
      <Version>16.5.132</Version>
    </PackageReference>
--- a/iothub/device/tests/Microsoft.Azure.Devices.Client.Tests.csproj
+++ b/iothub/device/tests/Microsoft.Azure.Devices.Client.Tests.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp2.1;net472;net451</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp3.1;net472;net451</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1</TargetFrameworks>
    <!-- By setting this as not a test project for other frameworks, we can run "dotnet test" for a specific framework from the root directory without dotnet throwing if any test project in the solution doesn't support that framework -->
-    <IsTestProject Condition="'$(OS)' != 'Windows_NT' And '$(TargetFramework)' != 'netcoreapp2.1'">False</IsTestProject>
+    <IsTestProject Condition="'$(OS)' != 'Windows_NT' And '$(TargetFramework)' != 'netcoreapp3.1'">False</IsTestProject>

    <IsPackable>false</IsPackable>
    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
--- a/iothub/service/tests/Microsoft.Azure.Devices.Tests.csproj
+++ b/iothub/service/tests/Microsoft.Azure.Devices.Tests.csproj
@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1</TargetFrameworks>
    <!-- By setting this as not a test project for other frameworks, we can run "dotnet test" for a specific framework from the root directory without dotnet throwing if any test project in the solution doesn't support that framework -->
-    <IsTestProject Condition="'$(OS)' != 'Windows_NT' And '$(TargetFramework)' != 'netcoreapp2.1'">False</IsTestProject>
+    <IsTestProject Condition="'$(OS)' != 'Windows_NT' And '$(TargetFramework)' != 'netcoreapp3.1'">False</IsTestProject>
    <IsPackable>false</IsPackable>
    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
    <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
--- a/provisioning/device/tests/Microsoft.Azure.Devices.Provisioning.Client.Tests.csproj
+++ b/provisioning/device/tests/Microsoft.Azure.Devices.Provisioning.Client.Tests.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <!-- By setting this as not a test project for other frameworks, we can run "dotnet test" for a specific framework from the root directory without dotnet throwing if any test project in the solution doesn't support that framework -->
-    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp2.1')">False</IsTestProject>
+    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp3.1')">False</IsTestProject>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors> 
    <IsPackable>false</IsPackable>
  </PropertyGroup>
--- a/provisioning/service/tests/Microsoft.Azure.Devices.Provisioning.Service.Tests.csproj
+++ b/provisioning/service/tests/Microsoft.Azure.Devices.Provisioning.Service.Tests.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <!-- By setting this as not a test project for other frameworks, we can run "dotnet test" for a specific framework from the root directory without dotnet throwing if any test project in the solution doesn't support that framework -->
-    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp2.1')">False</IsTestProject>
+    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp3.1')">False</IsTestProject>
    <!-- FXCop TODO: #176 re-enable warnings as errors. -->
    <TreatWarningsAsErrors>false</TreatWarningsAsErrors> 
    <IsPackable>false</IsPackable>
--- a/provisioning/transport/amqp/tests/Microsoft.Azure.Devices.Provisioning.Transport.Amqp.Tests.csproj
+++ b/provisioning/transport/amqp/tests/Microsoft.Azure.Devices.Provisioning.Transport.Amqp.Tests.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <!-- By setting this as not a test project for other frameworks, we can run "dotnet test" for a specific framework from the root directory without dotnet throwing if any test project in the solution doesn't support that framework -->
-    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp2.1')">False</IsTestProject>
+    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp3.1')">False</IsTestProject>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
--- a/provisioning/transport/http/tests/Microsoft.Azure.Devices.Provisioning.Transport.Http.Tests.csproj
+++ b/provisioning/transport/http/tests/Microsoft.Azure.Devices.Provisioning.Transport.Http.Tests.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <!-- By setting this as not a test project for other frameworks, we can run "dotnet test" for a specific framework from the root directory without dotnet throwing if any test project in the solution doesn't support that framework -->
-    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp2.1')">False</IsTestProject>
+    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp3.1')">False</IsTestProject>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
--- a/provisioning/transport/mqtt/tests/Microsoft.Azure.Devices.Provisioning.Transport.Mqtt.Tests.csproj
+++ b/provisioning/transport/mqtt/tests/Microsoft.Azure.Devices.Provisioning.Transport.Mqtt.Tests.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <!-- By setting this as not a test project for other frameworks, we can run "dotnet test" for a specific framework from the root directory without dotnet throwing if any test project in the solution doesn't support that framework -->
-    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp2.1')">False</IsTestProject>
+    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp3.1')">False</IsTestProject>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
--- a/security/tpm/tests/Microsoft.Azure.Devices.Provisioning.Security.Tpm.Tests.csproj
+++ b/security/tpm/tests/Microsoft.Azure.Devices.Provisioning.Security.Tpm.Tests.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <!-- By setting this as not a test project for other frameworks, we can run "dotnet test" for a specific framework from the root directory without dotnet throwing if any test project in the solution doesn't support that framework -->
-    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp2.1')">False</IsTestProject>
+    <IsTestProject Condition="('$(TargetFramework)' != 'netcoreapp3.1')">False</IsTestProject>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
--- a/shared/tests/Microsoft.Azure.Devices.Shared.Tests.csproj
+++ b/shared/tests/Microsoft.Azure.Devices.Shared.Tests.csproj
@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <RootNamespace>Microsoft.Azure.Devices.Shared.Tests</RootNamespace>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp2.1;net472;net451</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp3.1;net472;net451</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1</TargetFrameworks>
    <!-- By setting this as not a test project for other frameworks, we can run "dotnet test" for a specific framework from the root directory without dotnet throwing if any test project in the solution doesn't support that framework -->
-    <IsTestProject Condition="'$(OS)' != 'Windows_NT' And '$(TargetFramework)' != 'netcoreapp2.1'">False</IsTestProject>
+    <IsTestProject Condition="'$(OS)' != 'Windows_NT' And '$(TargetFramework)' != 'netcoreapp3.1'">False</IsTestProject>

    <IsPackable>false</IsPackable>
    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
--- a/vsts/test-release-nuget.yaml
+++ b/vsts/test-release-nuget.yaml
@ -10,8 +10,8 @@ jobs:
      # Change maxParallel to 1 make builds run in serial rather than in parallel
      maxParallel: 3
      matrix:
-        .Net Core 2.1:
-          FRAMEWORK: netcoreapp2.1
+        .Net Core 3.1:
+          FRAMEWORK: netcoreapp3.1

    condition: succeeded()
    pool:
@ -57,13 +57,6 @@ jobs:
          ports: '127.0.0.1:8888:8888'
          restartPolicy: unlessStopped

-      - task: UseDotNet@2
-        displayName: "Install .NET Core App 2.1"
-        inputs:
-            packageType: "sdk"
-            version: "2.1.x"
-            installationPath: $(Agent.ToolsDirectory)/dotnet
-
      - powershell: ./vsts/releaseTest.ps1
        displayName: Test release nugets
        env:
--- a/vsts/vsts.yaml
+++ b/vsts/vsts.yaml
@ -10,8 +10,8 @@ jobs:
      # Change maxParallel to 1 make builds run in serial rather than in parallel
      maxParallel: 3
      matrix:
-        .Net Core 2.1:
-          FRAMEWORK: netcoreapp2.1
+        .Net Core 3.1:
+          FRAMEWORK: netcoreapp3.1

    condition: succeeded()
    pool:
@ -32,13 +32,6 @@ jobs:

          restartPolicy: unlessStopped

-      - task: UseDotNet@2
-        displayName: "Install .NET Core App 2.1"
-        inputs:
-            packageType: "sdk"
-            version: "2.1.x"
-            installationPath: $(Agent.ToolsDirectory)/dotnet
-
      - task: Docker@1
        displayName: "Start Test Proxy"
        inputs:
@ -102,7 +95,7 @@ jobs:
        displayName: "Publish Test Results **/*.trx"
        inputs:
          testRunner: VSTest
-          testRunTitle: "Linux Tests (netcoreapp2.1)"
+          testRunTitle: "Linux Tests (netcoreapp3.1)"
          testResultsFiles: "**/*.trx"

        condition: always()
@ -114,8 +107,8 @@ jobs:
      # Change maxParallel to 1 make builds run in serial rather than in parallel
      maxParallel: 3
      matrix:
-        .Net Core 2.1:
-          FRAMEWORK: netcoreapp2.1
+        .Net Core 3.1:
+          FRAMEWORK: netcoreapp3.1
        .Net Framework 4.7.2:
          FRAMEWORK: net472
        .Net Framework 4.5.1: