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

Update ms code coverage zip
FortuneN · Mar 8, 2024 · 6a6fce2 · 6a6fce2
2 parents e4ffb5d + 2b60c2e
commit 6a6fce2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
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/...overageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs b/...overageTests/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