Pass AdditionalTestArguments to tests (#23081)

pakrym · web-flow · commit 7b64ed264c3e · 2021-08-04T16:19:38.000-07:00
diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
@@ -56,8 +56,9 @@ jobs:
           /p:ServiceDirectory=${{ parameters.ServiceToTest }}
           /p:IncludeSrc=false /p:IncludeSamples=false /p:IncludePerf=false /p:IncludeStress=false
           /p:RunApiCompat=false /p:InheritDocEnabled=false
-          /p:Configuration=$(BuildConfiguration) $(ConvertToProjectReferenceOption)
+          /p:Configuration=$(BuildConfiguration)
           /p:CollectCoverage=$(CollectCoverage) /p:CodeCoverageDirectory=$(Build.SourcesDirectory)\sdk\${{parameters.ServiceDirectory}}
+          $(AdditionalTestArguments)
         displayName: "Build & Test ($(TestTargetFramework))"
       - task: PublishTestResults@2
         condition: always()
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
@@ -37,13 +37,10 @@
           }
       },
       "TestMode": {
-          "netcoreapp21_Coverage_Record": {
+          "netcoreapp31_Coverage_Record": {
               "SupportsRecording": true,
               "CollectCoverage": true,
               "TestTargetFramework": "netcoreapp3.1"
-          },
-          "net5.0": {
-              "TestTargetFramework": "net5.0"
           }
       }
     }
diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml
@@ -1,7 +1,7 @@
 variables:
   DocWardenVersion: '0.6.1'
   OfficialBuildId: $(Build.BuildNumber)
-  ConvertToProjectReferenceOption: ''
+  AdditionalTestArguments: ''
   skipComponentGovernanceDetection: true
   NugetSecurityAnalysisWarningLevel: 'none'
   ${{ if ne(variables['System.TeamProject'], 'internal') }}:
diff --git a/sdk/translation/Azure.AI.Translation.Document/tests/Azure.AI.Translation.Document.Tests.csproj b/sdk/translation/Azure.AI.Translation.Document/tests/Azure.AI.Translation.Document.Tests.csproj
@@ -16,4 +16,8 @@
     <ProjectReference Include="..\src\Azure.AI.Translation.Document.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ExcludeFromProjectReferenceToConversion Include="Azure.Storage.Blobs" />
+  </ItemGroup>
+
 </Project>
diff --git a/sdk/translation/Azure.AI.Translation.Document/tests/Infrastructure/DocumentTranslationLiveTestBase.cs b/sdk/translation/Azure.AI.Translation.Document/tests/Infrastructure/DocumentTranslationLiveTestBase.cs
@@ -62,7 +62,10 @@ public DocumentTranslationClient GetClient(
 
         public BlobContainerClient GetBlobContainerClient(string containerName)
         {
-            return InstrumentClient(new BlobContainerClient(TestEnvironment.StorageConnectionString, containerName, InstrumentClientOptions(new BlobClientOptions())));
+            return InstrumentClient(new BlobContainerClient(
+                TestEnvironment.StorageConnectionString,
+                containerName,
+                InstrumentClientOptions(new BlobClientOptions(BlobClientOptions.ServiceVersion.V2020_04_08))));
         }
 
         public Uri CreateSourceContainer(List<TestDocument> documents)

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,10 @@`
`37`	`37`	`}`
`38`	`38`	`},`
`39`	`39`	`"TestMode": {`
`40`		`- "netcoreapp21_Coverage_Record": {`
	`40`	`+ "netcoreapp31_Coverage_Record": {`
`41`	`41`	`"SupportsRecording": true,`
`42`	`42`	`"CollectCoverage": true,`
`43`	`43`	`"TestTargetFramework": "netcoreapp3.1"`
`44`		`- },`
`45`		`- "net5.0": {`
`46`		`- "TestTargetFramework": "net5.0"`
`47`	`44`	`}`
`48`	`45`	`}`
`49`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,10 @@ public DocumentTranslationClient GetClient(`
`62`	`62`
`63`	`63`	`public BlobContainerClient GetBlobContainerClient(string containerName)`
`64`	`64`	`{`
`65`		`- return InstrumentClient(new BlobContainerClient(TestEnvironment.StorageConnectionString, containerName, InstrumentClientOptions(new BlobClientOptions())));`
	`65`	`+ return InstrumentClient(new BlobContainerClient(`
	`66`	`+ TestEnvironment.StorageConnectionString,`
	`67`	`+ containerName,`
	`68`	`+ InstrumentClientOptions(new BlobClientOptions(BlobClientOptions.ServiceVersion.V2020_04_08))));`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`public Uri CreateSourceContainer(List<TestDocument> documents)`