Merge pull request #399 from tonyhallett/update-ms-code-coverage-zip

tonyhallett · web-flow · commit 6a6fce21a46f · 2024-03-08T10:25:38.000Z
Update ms code coverage zip
diff --git a/FineCodeCoverage/FineCodeCoverage.csproj b/FineCodeCoverage/FineCodeCoverage.csproj
@@ -101,10 +101,6 @@
       <Link>Resources\OutputToolWindowCommand.png</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\Shared Files\ZippedTools\microsoft.codecoverage.17.1.0.zip">
-      <Link>ZippedTools\microsoft.codecoverage.17.1.0.zip</Link>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
     <Content Include="..\Shared Files\ZippedTools\microsoft.testplatform.16.9.1.zip">
       <Link>ZippedTools\microsoft.testplatform.16.9.1.zip</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -125,6 +121,10 @@
       <Link>ZippedTools\reportGenerator.4.7.4.zip</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="..\Shared Files\ZippedTools\microsoft.codecoverage.17.9.0.zip">
+      <Link>ZippedTools\microsoft.codecoverage.17.9.0.zip</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <!--
     <None Include="Key.snk" />
 	-->
diff --git a/FineCodeCoverage2022/FineCodeCoverage2022.csproj b/FineCodeCoverage2022/FineCodeCoverage2022.csproj
@@ -93,10 +93,6 @@
       <Link>Resources\LICENSE</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\Shared Files\ZippedTools\microsoft.codecoverage.17.1.0.zip">
-      <Link>ZippedTools\microsoft.codecoverage.17.1.0.zip</Link>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
     <Content Include="..\Shared Files\ZippedTools\coverlet.collector.3.2.0.zip">
       <Link>ZippedTools\coverlet.collector.3.2.0.zip</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -109,6 +105,10 @@
       <Link>ZippedTools\reportGenerator.4.7.4.zip</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="..\Shared Files\ZippedTools\microsoft.codecoverage.17.9.0.zip">
+      <Link>ZippedTools\microsoft.codecoverage.17.9.0.zip</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
       <Generator>VsixManifestGenerator</Generator>
diff --git a/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs b/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs
@@ -134,7 +134,7 @@ private string GetFCCMsTestAdapterPath()
                 .Returns("ZipDestination");
 
             msCodeCoverageRunSettingsService.Initialize(null, null, CancellationToken.None);
-            return Path.Combine("ZipDestination", "build", "netstandard1.0");
+            return Path.Combine("ZipDestination", "build", "netstandard2.0");
         }
     
     }
diff --git a/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IsCollecting_Tests.cs b/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IsCollecting_Tests.cs
@@ -510,13 +510,13 @@ private void VerifyCombinedLogMessage(string message)
         private string InitializeFCCMsTestAdapterPath()
         {
             InitializeZipDestination();
-            return Path.Combine("ZipDestination", "build", "netstandard1.0");
+            return Path.Combine("ZipDestination", "build", "netstandard2.0");
         }
 
         private string InitializeShimPath()
         {
             InitializeZipDestination();
-            return Path.Combine("ZipDestination", "build", "netstandard1.0", "CodeCoverage", "coreclr", "Microsoft.VisualStudio.CodeCoverage.Shim.dll");
+            return Path.Combine("ZipDestination", "build", "netstandard2.0", "CodeCoverage", "coreclr", "Microsoft.VisualStudio.CodeCoverage.Shim.dll");
         }
 
         private void InitializeZipDestination()
diff --git a/Shared Files/ZippedTools/microsoft.codecoverage.17.1.0.zip b/Shared Files/ZippedTools/microsoft.codecoverage.17.1.0.zip
diff --git a/Shared Files/ZippedTools/microsoft.codecoverage.17.9.0.zip b/Shared Files/ZippedTools/microsoft.codecoverage.17.9.0.zip
diff --git a/SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs b/SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs
@@ -112,8 +112,8 @@ public void Initialize(string appDataFolder, IFCCEngine fccEngine, CancellationT
         {
             this.fccEngine = fccEngine;
             var zipDestination = toolUnzipper.EnsureUnzipped(appDataFolder, zipDirectoryName,zipPrefix, cancellationToken);
-            fccMsTestAdapterPath = Path.Combine(zipDestination, "build", "netstandard1.0");
-            shimPath = Path.Combine(zipDestination, "build", "netstandard1.0", "CodeCoverage", "coreclr", "Microsoft.VisualStudio.CodeCoverage.Shim.dll");
+            fccMsTestAdapterPath = Path.Combine(zipDestination, "build", "netstandard2.0");
+            shimPath = Path.Combine(zipDestination, "build", "netstandard2.0", "CodeCoverage", "coreclr", "Microsoft.VisualStudio.CodeCoverage.Shim.dll");
         }
         
         #region set up for collection

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ private string GetFCCMsTestAdapterPath()`
`134`	`134`	`.Returns("ZipDestination");`
`135`	`135`
`136`	`136`	`msCodeCoverageRunSettingsService.Initialize(null, null, CancellationToken.None);`
`137`		`- return Path.Combine("ZipDestination", "build", "netstandard1.0");`
	`137`	`+ return Path.Combine("ZipDestination", "build", "netstandard2.0");`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -510,13 +510,13 @@ private void VerifyCombinedLogMessage(string message)`
`510`	`510`	`private string InitializeFCCMsTestAdapterPath()`
`511`	`511`	`{`
`512`	`512`	`InitializeZipDestination();`
`513`		`- return Path.Combine("ZipDestination", "build", "netstandard1.0");`
	`513`	`+ return Path.Combine("ZipDestination", "build", "netstandard2.0");`
`514`	`514`	`}`
`515`	`515`
`516`	`516`	`private string InitializeShimPath()`
`517`	`517`	`{`
`518`	`518`	`InitializeZipDestination();`
`519`		`- return Path.Combine("ZipDestination", "build", "netstandard1.0", "CodeCoverage", "coreclr", "Microsoft.VisualStudio.CodeCoverage.Shim.dll");`
	`519`	`+ return Path.Combine("ZipDestination", "build", "netstandard2.0", "CodeCoverage", "coreclr", "Microsoft.VisualStudio.CodeCoverage.Shim.dll");`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`private void InitializeZipDestination()`
Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,8 @@ public void Initialize(string appDataFolder, IFCCEngine fccEngine, CancellationT`
`112`	`112`	`{`
`113`	`113`	`this.fccEngine = fccEngine;`
`114`	`114`	`var zipDestination = toolUnzipper.EnsureUnzipped(appDataFolder, zipDirectoryName,zipPrefix, cancellationToken);`
`115`		`- fccMsTestAdapterPath = Path.Combine(zipDestination, "build", "netstandard1.0");`
`116`		`- shimPath = Path.Combine(zipDestination, "build", "netstandard1.0", "CodeCoverage", "coreclr", "Microsoft.VisualStudio.CodeCoverage.Shim.dll");`
	`115`	`+ fccMsTestAdapterPath = Path.Combine(zipDestination, "build", "netstandard2.0");`
	`116`	`+ shimPath = Path.Combine(zipDestination, "build", "netstandard2.0", "CodeCoverage", "coreclr", "Microsoft.VisualStudio.CodeCoverage.Shim.dll");`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`#region set up for collection`