diff --git a/FineCodeCoverage/FineCodeCoverage.csproj b/FineCodeCoverage/FineCodeCoverage.csproj index e0a731f1..df4d01ad 100644 --- a/FineCodeCoverage/FineCodeCoverage.csproj +++ b/FineCodeCoverage/FineCodeCoverage.csproj @@ -101,10 +101,6 @@ Resources\OutputToolWindowCommand.png true - - ZippedTools\microsoft.codecoverage.17.1.0.zip - true - ZippedTools\microsoft.testplatform.16.9.1.zip true @@ -125,6 +121,10 @@ ZippedTools\reportGenerator.4.7.4.zip true + + ZippedTools\microsoft.codecoverage.17.9.0.zip + true + diff --git a/FineCodeCoverage2022/FineCodeCoverage2022.csproj b/FineCodeCoverage2022/FineCodeCoverage2022.csproj index 2f44f446..17126cc1 100644 --- a/FineCodeCoverage2022/FineCodeCoverage2022.csproj +++ b/FineCodeCoverage2022/FineCodeCoverage2022.csproj @@ -93,10 +93,6 @@ Resources\LICENSE true - - ZippedTools\microsoft.codecoverage.17.1.0.zip - true - ZippedTools\coverlet.collector.3.2.0.zip true @@ -109,6 +105,10 @@ ZippedTools\reportGenerator.4.7.4.zip true + + ZippedTools\microsoft.codecoverage.17.9.0.zip + true + Designer VsixManifestGenerator diff --git a/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs b/FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs index 97746f4d..84d6a641 100644 --- 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 index b626fcc2..423c1140 100644 --- 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 deleted file mode 100644 index 52ceb7f3..00000000 Binary files a/Shared Files/ZippedTools/microsoft.codecoverage.17.1.0.zip and /dev/null differ diff --git a/Shared Files/ZippedTools/microsoft.codecoverage.17.9.0.zip b/Shared Files/ZippedTools/microsoft.codecoverage.17.9.0.zip new file mode 100644 index 00000000..67421c4d Binary files /dev/null and b/Shared Files/ZippedTools/microsoft.codecoverage.17.9.0.zip differ diff --git a/SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs b/SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs index 2cda2b1d..cf137bce 100644 --- 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