From 5f7486d6e167f596a40aaf4827035f1757859790 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Thu, 21 Jul 2022 15:57:19 +0200 Subject: [PATCH 01/22] adding new libs, --- TestPlatform.sln | 12 ++++++++ scripts/build.ps1 | 3 ++ src/datacollector/DataCollectorMain.cs | 7 +++++ src/datacollector/Program.cs | 29 +++++++++++++++++++ src/datacollector/datacollector.csproj | 3 ++ .../nuspec/Microsoft.TestPlatform.nuspec | 2 ++ 6 files changed, 56 insertions(+) diff --git a/TestPlatform.sln b/TestPlatform.sln index 617d61d258..e8466c8e48 100644 --- a/TestPlatform.sln +++ b/TestPlatform.sln @@ -934,6 +934,18 @@ Global {62E9D32B-B989-43CF-81A2-B38B3367FCA3}.Release|x64.Build.0 = Release|Any CPU {62E9D32B-B989-43CF-81A2-B38B3367FCA3}.Release|x86.ActiveCfg = Release|Any CPU {62E9D32B-B989-43CF-81A2-B38B3367FCA3}.Release|x86.Build.0 = Release|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Debug|x64.ActiveCfg = Debug|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Debug|x64.Build.0 = Debug|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Debug|x86.ActiveCfg = Debug|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Debug|x86.Build.0 = Debug|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Release|Any CPU.Build.0 = Release|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Release|x64.ActiveCfg = Release|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Release|x64.Build.0 = Release|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Release|x86.ActiveCfg = Release|Any CPU + {4DA57968-F547-4019-8381-03A218B6C385}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/scripts/build.ps1 b/scripts/build.ps1 index c9e9cce891..52384c8274 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -996,6 +996,7 @@ function Copy-CodeCoverage-Package-Artifacts { $codeCoverageCorePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.core\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" $codeCoverageInterprocessPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.interprocess\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" $codeCoverageInstrumentationPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.instrumentation\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" + $codeCoverageTelemetryPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.telemetry\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" $codeCoverageImUbuntuPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\ubuntu" $codeCoverageImAlpinePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\alpine" $codeCoverageImMacosPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\macos" @@ -1013,6 +1014,8 @@ function Copy-CodeCoverage-Package-Artifacts { Copy-Item $codeCoverageInstrumentationPackagesDir\Microsoft.CodeCoverage.Instrumentation.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $codeCoverageInstrumentationPackagesDir\Mono.Cecil.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $codeCoverageInstrumentationPackagesDir\Mono.Cecil.Pdb.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $codeCoverageTelemetryPackagesDir\Microsoft.CodeCoverage.Telemetry.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $codeCoverageTelemetryPackagesDir\Microsoft.VisualStudio.Telemetry.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $internalCodeCoveragePackagesDir\CodeCoverage $microsoftCodeCoveragePackageDir -Force -Recurse Copy-Item $internalCodeCoveragePackagesDir\InstrumentationEngine $microsoftCodeCoveragePackageDir -Force -Recurse Copy-Item $internalCodeCoveragePackagesDir\Shim $microsoftCodeCoveragePackageDir -Force -Recurse diff --git a/src/datacollector/DataCollectorMain.cs b/src/datacollector/DataCollectorMain.cs index 5653fd4565..034b7180e0 100644 --- a/src/datacollector/DataCollectorMain.cs +++ b/src/datacollector/DataCollectorMain.cs @@ -4,7 +4,10 @@ using System; using System.Globalization; using System.Reflection; +using System.Threading.Tasks; +using System.Threading; +using Microsoft.VisualStudio.Telemetry; using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities; using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection; using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces; @@ -71,8 +74,12 @@ internal DataCollectorMain(IProcessHelper processHelper, IEnvironment environmen _uiLanguageOverride = uiLanguageOverride; } + + public void Run(string[]? args) { + System.Diagnostics.Debug.Assert(false); + DebuggerBreakpoint.AttachVisualStudioDebugger("VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS"); DebuggerBreakpoint.WaitForDebugger("VSTEST_DATACOLLECTOR_DEBUG"); diff --git a/src/datacollector/Program.cs b/src/datacollector/Program.cs index 2a380e1d76..23d4f85291 100644 --- a/src/datacollector/Program.cs +++ b/src/datacollector/Program.cs @@ -3,6 +3,7 @@ using System; +using Microsoft.VisualStudio.Telemetry; using Microsoft.VisualStudio.TestPlatform.ObjectModel; namespace Microsoft.VisualStudio.TestPlatform.DataCollector; @@ -20,6 +21,8 @@ public class Program /// public static void Main(string[]? args) { + System.Diagnostics.Debug.Assert(false); + SendTelemetry(); try { new DataCollectorMain().Run(args); @@ -34,4 +37,30 @@ public static void Main(string[]? args) EqtTrace.Info("Program.Main: exiting datacollector process."); } } + + private static void SendTelemetry() + { + try + { + TelemetryService.DefaultSession.IsOptedIn = true; + TelemetryService.DefaultSession.UseVsIsOptedIn(); + TelemetryService.DefaultSession.Start(); + TelemetryEvent coloringEvent = new("vs/codecoverage/faisal/main"); + coloringEvent.Properties["vs.codecoverage.faisal.collectorproperty"] = false; + TelemetryService.DefaultSession.PostEvent(coloringEvent); + //if (networkAsync) + //{ + // var cts = new CancellationTokenSource(60000); + // await TelemetryService.DefaultSession.DisposeToNetworkAsync(cts.Token).ConfigureAwait(false); + //} + //else + { + TelemetryService.DefaultSession.Dispose(); + } + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } + } } diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj index 7905489dc3..4e610808fe 100644 --- a/src/datacollector/datacollector.csproj +++ b/src/datacollector/datacollector.csproj @@ -47,5 +47,8 @@ + + + diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec index c60e443ab3..33f0199851 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.nuspec +++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec @@ -252,6 +252,8 @@ + + From 67181d6dbc878a932fc0c75e225b410063b8cd7c Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Thu, 21 Jul 2022 16:00:07 +0200 Subject: [PATCH 02/22] undo, --- src/datacollector/DataCollectorMain.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/datacollector/DataCollectorMain.cs b/src/datacollector/DataCollectorMain.cs index 034b7180e0..a141f5cf37 100644 --- a/src/datacollector/DataCollectorMain.cs +++ b/src/datacollector/DataCollectorMain.cs @@ -78,8 +78,6 @@ internal DataCollectorMain(IProcessHelper processHelper, IEnvironment environmen public void Run(string[]? args) { - System.Diagnostics.Debug.Assert(false); - DebuggerBreakpoint.AttachVisualStudioDebugger("VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS"); DebuggerBreakpoint.WaitForDebugger("VSTEST_DATACOLLECTOR_DEBUG"); From ef3da42bf05d79118cc93ee91a3a752f81c5bee9 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Thu, 21 Jul 2022 17:19:16 +0200 Subject: [PATCH 03/22] revert changes, --- src/datacollector/Program.cs | 29 -------------------------- src/datacollector/datacollector.csproj | 3 --- 2 files changed, 32 deletions(-) diff --git a/src/datacollector/Program.cs b/src/datacollector/Program.cs index 23d4f85291..2a380e1d76 100644 --- a/src/datacollector/Program.cs +++ b/src/datacollector/Program.cs @@ -3,7 +3,6 @@ using System; -using Microsoft.VisualStudio.Telemetry; using Microsoft.VisualStudio.TestPlatform.ObjectModel; namespace Microsoft.VisualStudio.TestPlatform.DataCollector; @@ -21,8 +20,6 @@ public class Program /// public static void Main(string[]? args) { - System.Diagnostics.Debug.Assert(false); - SendTelemetry(); try { new DataCollectorMain().Run(args); @@ -37,30 +34,4 @@ public static void Main(string[]? args) EqtTrace.Info("Program.Main: exiting datacollector process."); } } - - private static void SendTelemetry() - { - try - { - TelemetryService.DefaultSession.IsOptedIn = true; - TelemetryService.DefaultSession.UseVsIsOptedIn(); - TelemetryService.DefaultSession.Start(); - TelemetryEvent coloringEvent = new("vs/codecoverage/faisal/main"); - coloringEvent.Properties["vs.codecoverage.faisal.collectorproperty"] = false; - TelemetryService.DefaultSession.PostEvent(coloringEvent); - //if (networkAsync) - //{ - // var cts = new CancellationTokenSource(60000); - // await TelemetryService.DefaultSession.DisposeToNetworkAsync(cts.Token).ConfigureAwait(false); - //} - //else - { - TelemetryService.DefaultSession.Dispose(); - } - } - catch (Exception ex) - { - Console.WriteLine(ex.Message); - } - } } diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj index 4e610808fe..7905489dc3 100644 --- a/src/datacollector/datacollector.csproj +++ b/src/datacollector/datacollector.csproj @@ -47,8 +47,5 @@ - - - From a093ad3d48eabc34a5d75bb007fadda99ad6e0ce Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Thu, 21 Jul 2022 17:49:28 +0200 Subject: [PATCH 04/22] undo changes, --- TestPlatform.sln | 12 ------------ src/datacollector/DataCollectorMain.cs | 5 ----- 2 files changed, 17 deletions(-) diff --git a/TestPlatform.sln b/TestPlatform.sln index e8466c8e48..617d61d258 100644 --- a/TestPlatform.sln +++ b/TestPlatform.sln @@ -934,18 +934,6 @@ Global {62E9D32B-B989-43CF-81A2-B38B3367FCA3}.Release|x64.Build.0 = Release|Any CPU {62E9D32B-B989-43CF-81A2-B38B3367FCA3}.Release|x86.ActiveCfg = Release|Any CPU {62E9D32B-B989-43CF-81A2-B38B3367FCA3}.Release|x86.Build.0 = Release|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Debug|x64.ActiveCfg = Debug|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Debug|x64.Build.0 = Debug|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Debug|x86.ActiveCfg = Debug|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Debug|x86.Build.0 = Debug|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Release|Any CPU.Build.0 = Release|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Release|x64.ActiveCfg = Release|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Release|x64.Build.0 = Release|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Release|x86.ActiveCfg = Release|Any CPU - {4DA57968-F547-4019-8381-03A218B6C385}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/datacollector/DataCollectorMain.cs b/src/datacollector/DataCollectorMain.cs index a141f5cf37..5653fd4565 100644 --- a/src/datacollector/DataCollectorMain.cs +++ b/src/datacollector/DataCollectorMain.cs @@ -4,10 +4,7 @@ using System; using System.Globalization; using System.Reflection; -using System.Threading.Tasks; -using System.Threading; -using Microsoft.VisualStudio.Telemetry; using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities; using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection; using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces; @@ -74,8 +71,6 @@ internal DataCollectorMain(IProcessHelper processHelper, IEnvironment environmen _uiLanguageOverride = uiLanguageOverride; } - - public void Run(string[]? args) { DebuggerBreakpoint.AttachVisualStudioDebugger("VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS"); From 79e4fd7a915257da9127f2d66acbbb481ebb698a Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Fri, 22 Jul 2022 09:49:53 +0200 Subject: [PATCH 05/22] adding files to the package, --- eng/Versions.props | 5 ++++- scripts/build.ps1 | 13 +++++++++---- src/package/external/external.csproj | 6 +++--- src/package/nuspec/Microsoft.CodeCoverage.nuspec | 4 ++++ src/package/nuspec/Microsoft.TestPlatform.nuspec | 2 ++ 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 93da3efa6b..dbeb7dc6eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,8 +82,11 @@ JS etc.) is risky. This can break setup authoring and cause runtime failures in workloads where Rolsyn is not installed. --> 3.8.0-3.20427.2 - 17.4.3-beta.22370.3 + 17.4.2-beta.22371.4 0.2.0-preview.21508.1 5.0.0-preview.21508.1 + 16.4.78 + 16.3.36 + 16.3.44 diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 52384c8274..281273a7b1 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -685,9 +685,9 @@ function Publish-Package { New-Item $testPlatformDirectory -Type Directory -Force | Out-Null } - $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\16.3.58\lib\net45" - $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\16.3.23\lib\net45" - $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\16.3.23\lib\net45" + $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$MicrosoftVSTelemetryVersion\lib\net45" + $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$MicrosoftVSRemoteControlVersion\lib\net45" + $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$MicrosoftVSUtilitiesInternalVersion\lib\net45" Copy-Item "$visualStudioTelemetryDirectory\Microsoft.VisualStudio.Telemetry.dll" $testPlatformDirectory -Force Copy-Item "$visualStudioRemoteControl\Microsoft.VisualStudio.RemoteControl.dll" $testPlatformDirectory -Force @@ -1000,6 +1000,9 @@ function Copy-CodeCoverage-Package-Artifacts { $codeCoverageImUbuntuPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\ubuntu" $codeCoverageImAlpinePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\alpine" $codeCoverageImMacosPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\macos" + $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$MicrosoftVSTelemetryVersion\lib\$TPB_TargetFrameworkNS20" + $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$MicrosoftVSRemoteControlVersion\lib\$TPB_TargetFrameworkNS20" + $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$MicrosoftVSUtilitiesInternalVersion\lib\$TPB_TargetFrameworkNS20" $microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\") $microsoftCodeCoverageExtensionsPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage.Extensions\") @@ -1015,7 +1018,9 @@ function Copy-CodeCoverage-Package-Artifacts { Copy-Item $codeCoverageInstrumentationPackagesDir\Mono.Cecil.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $codeCoverageInstrumentationPackagesDir\Mono.Cecil.Pdb.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $codeCoverageTelemetryPackagesDir\Microsoft.CodeCoverage.Telemetry.dll $microsoftCodeCoveragePackageDir -Force - Copy-Item $codeCoverageTelemetryPackagesDir\Microsoft.VisualStudio.Telemetry.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $visualStudioTelemetryDirectory\Microsoft.VisualStudio.Telemetry.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $visualStudioRemoteControl\Microsoft.VisualStudio.RemoteControl.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $visualStudioUtilitiesDirectory\Microsoft.VisualStudio.Utilities.Internal.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $internalCodeCoveragePackagesDir\CodeCoverage $microsoftCodeCoveragePackageDir -Force -Recurse Copy-Item $internalCodeCoveragePackagesDir\InstrumentationEngine $microsoftCodeCoveragePackageDir -Force -Recurse Copy-Item $internalCodeCoveragePackagesDir\Shim $microsoftCodeCoveragePackageDir -Force -Recurse diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 03f1bd6297..d2830d6699 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -51,9 +51,9 @@ - - - + + + diff --git a/src/package/nuspec/Microsoft.CodeCoverage.nuspec b/src/package/nuspec/Microsoft.CodeCoverage.nuspec index 121c92dcb5..42abd1cc1c 100644 --- a/src/package/nuspec/Microsoft.CodeCoverage.nuspec +++ b/src/package/nuspec/Microsoft.CodeCoverage.nuspec @@ -36,6 +36,10 @@ + + + + diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec index 33f0199851..7b591cd7d6 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.nuspec +++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec @@ -254,6 +254,8 @@ + + From b079b3f176fcbb77312f0678972021cd0bec65b5 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Fri, 22 Jul 2022 10:06:44 +0200 Subject: [PATCH 06/22] fixing stuff, --- eng/Versions.props | 6 +++--- scripts/build.ps1 | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index dbeb7dc6eb..55b19f7d26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,8 +85,8 @@ 17.4.2-beta.22371.4 0.2.0-preview.21508.1 5.0.0-preview.21508.1 - 16.4.78 - 16.3.36 - 16.3.44 + 16.4.78 + 16.3.44 + 16.3.36 diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 281273a7b1..17d935c102 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -685,9 +685,12 @@ function Publish-Package { New-Item $testPlatformDirectory -Type Directory -Force | Out-Null } - $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$MicrosoftVSTelemetryVersion\lib\net45" - $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$MicrosoftVSRemoteControlVersion\lib\net45" - $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$MicrosoftVSUtilitiesInternalVersion\lib\net45" + $visualStudioTelemetryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioTelemetryVersion + $visualStudioRemoteControlVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioRemoteControlVersion + $visualStudioUtilitiesInternalVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioUtilitiesInternalVersion + $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$visualStudioTelemetryVersion\lib\net45" + $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$visualStudioRemoteControlVersion\lib\net45" + $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$visualStudioUtilitiesInternalVersion\lib\net45" Copy-Item "$visualStudioTelemetryDirectory\Microsoft.VisualStudio.Telemetry.dll" $testPlatformDirectory -Force Copy-Item "$visualStudioRemoteControl\Microsoft.VisualStudio.RemoteControl.dll" $testPlatformDirectory -Force @@ -990,7 +993,9 @@ function Create-NugetPackages { function Copy-CodeCoverage-Package-Artifacts { # Copy TraceDataCollector to Microsoft.CodeCoverage folder. $codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftInternalCodeCoverageVersion - $traceDataCollectorPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.tracedatacollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" + $visualStudioTelemetryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioTelemetryVersion + $visualStudioRemoteControlVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioRemoteControlVersion + $visualStudioUtilitiesInternalVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioUtilitiesInternalVersion $traceDataCollectorPackagesNetFxDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.TraceDataCollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework472" $internalCodeCoveragePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\" $codeCoverageCorePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.core\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" @@ -1000,9 +1005,9 @@ function Copy-CodeCoverage-Package-Artifacts { $codeCoverageImUbuntuPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\ubuntu" $codeCoverageImAlpinePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\alpine" $codeCoverageImMacosPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\macos" - $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$MicrosoftVSTelemetryVersion\lib\$TPB_TargetFrameworkNS20" - $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$MicrosoftVSRemoteControlVersion\lib\$TPB_TargetFrameworkNS20" - $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$MicrosoftVSUtilitiesInternalVersion\lib\$TPB_TargetFrameworkNS20" + $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$visualStudioTelemetryVersion\lib\$TPB_TargetFrameworkNS20" + $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$visualStudioRemoteControlVersion\lib\$TPB_TargetFrameworkNS20" + $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$visualStudioUtilitiesInternalVersion\lib\$TPB_TargetFrameworkNS20" $microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\") $microsoftCodeCoverageExtensionsPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage.Extensions\") From 7f716a04f63a0cbd8d2a1f362e5a4ccc0602056f Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Fri, 22 Jul 2022 10:14:01 +0200 Subject: [PATCH 07/22] fix, --- src/package/external/external.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index d2830d6699..87b21021e9 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -51,9 +51,9 @@ - - - + + + From f4054d24f9a1c343f930aa3d5f856a030699c45d Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Fri, 22 Jul 2022 11:56:05 +0200 Subject: [PATCH 08/22] fixing build, --- scripts/build.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 17d935c102..e45bc94c9c 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -993,6 +993,7 @@ function Create-NugetPackages { function Copy-CodeCoverage-Package-Artifacts { # Copy TraceDataCollector to Microsoft.CodeCoverage folder. $codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftInternalCodeCoverageVersion + $traceDataCollectorPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.tracedatacollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" $visualStudioTelemetryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioTelemetryVersion $visualStudioRemoteControlVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioRemoteControlVersion $visualStudioUtilitiesInternalVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioUtilitiesInternalVersion From 9b04e52e70cc27985de86d97fd00dcc0cab5aecc Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Fri, 22 Jul 2022 12:11:37 +0200 Subject: [PATCH 09/22] updating count, --- scripts/verify-nupkgs.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1 index fea60c54c5..2da868a332 100644 --- a/scripts/verify-nupkgs.ps1 +++ b/scripts/verify-nupkgs.ps1 @@ -12,9 +12,9 @@ function Verify-Nuget-Packages($packageDirectory, $version) { Write-Log "Starting Verify-Nuget-Packages." $expectedNumOfFiles = @{ - "Microsoft.CodeCoverage" = 57; + "Microsoft.CodeCoverage" = 61; "Microsoft.NET.Test.Sdk" = 24; - "Microsoft.TestPlatform" = 599; + "Microsoft.TestPlatform" = 603; "Microsoft.TestPlatform.Build" = 21; "Microsoft.TestPlatform.CLI" = 498; "Microsoft.TestPlatform.Extensions.TrxLogger" = 35; From 8096dd3569c1751c171023d54e6eae197b5842ab Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Fri, 22 Jul 2022 13:59:11 +0200 Subject: [PATCH 10/22] Adding Win32.Registry project, --- eng/Versions.props | 1 + scripts/build.ps1 | 3 +++ scripts/verify-nupkgs.ps1 | 4 ++-- src/package/external/external.csproj | 1 + src/package/nuspec/Microsoft.CodeCoverage.nuspec | 1 + src/package/nuspec/Microsoft.TestPlatform.nuspec | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 55b19f7d26..1d6dcdefe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -88,5 +88,6 @@ 16.4.78 16.3.44 16.3.36 + 6.0.0-preview.5.21301.5 diff --git a/scripts/build.ps1 b/scripts/build.ps1 index e45bc94c9c..e5b59047b0 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -997,6 +997,7 @@ function Copy-CodeCoverage-Package-Artifacts { $visualStudioTelemetryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioTelemetryVersion $visualStudioRemoteControlVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioRemoteControlVersion $visualStudioUtilitiesInternalVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioUtilitiesInternalVersion + $win32RegistryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftWin32Registry $traceDataCollectorPackagesNetFxDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.TraceDataCollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework472" $internalCodeCoveragePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\" $codeCoverageCorePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.core\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" @@ -1009,6 +1010,7 @@ function Copy-CodeCoverage-Package-Artifacts { $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$visualStudioTelemetryVersion\lib\$TPB_TargetFrameworkNS20" $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$visualStudioRemoteControlVersion\lib\$TPB_TargetFrameworkNS20" $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$visualStudioUtilitiesInternalVersion\lib\$TPB_TargetFrameworkNS20" + $win32RegistryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$win32RegistryVersion\lib\$TPB_TargetFrameworkNS20" $microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\") $microsoftCodeCoverageExtensionsPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage.Extensions\") @@ -1027,6 +1029,7 @@ function Copy-CodeCoverage-Package-Artifacts { Copy-Item $visualStudioTelemetryDirectory\Microsoft.VisualStudio.Telemetry.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $visualStudioRemoteControl\Microsoft.VisualStudio.RemoteControl.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $visualStudioUtilitiesDirectory\Microsoft.VisualStudio.Utilities.Internal.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $win32RegistryDirectory\Microsoft.Win32.Registry.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $internalCodeCoveragePackagesDir\CodeCoverage $microsoftCodeCoveragePackageDir -Force -Recurse Copy-Item $internalCodeCoveragePackagesDir\InstrumentationEngine $microsoftCodeCoveragePackageDir -Force -Recurse Copy-Item $internalCodeCoveragePackagesDir\Shim $microsoftCodeCoveragePackageDir -Force -Recurse diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1 index 2da868a332..f426035370 100644 --- a/scripts/verify-nupkgs.ps1 +++ b/scripts/verify-nupkgs.ps1 @@ -12,9 +12,9 @@ function Verify-Nuget-Packages($packageDirectory, $version) { Write-Log "Starting Verify-Nuget-Packages." $expectedNumOfFiles = @{ - "Microsoft.CodeCoverage" = 61; + "Microsoft.CodeCoverage" = 62; "Microsoft.NET.Test.Sdk" = 24; - "Microsoft.TestPlatform" = 603; + "Microsoft.TestPlatform" = 604; "Microsoft.TestPlatform.Build" = 21; "Microsoft.TestPlatform.CLI" = 498; "Microsoft.TestPlatform.Extensions.TrxLogger" = 35; diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 87b21021e9..60975ff92e 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -59,6 +59,7 @@ + diff --git a/src/package/nuspec/Microsoft.CodeCoverage.nuspec b/src/package/nuspec/Microsoft.CodeCoverage.nuspec index 42abd1cc1c..7ace1ca6d7 100644 --- a/src/package/nuspec/Microsoft.CodeCoverage.nuspec +++ b/src/package/nuspec/Microsoft.CodeCoverage.nuspec @@ -40,6 +40,7 @@ + diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec index 7b591cd7d6..9231c31412 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.nuspec +++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec @@ -256,6 +256,7 @@ + From 6722611b613943293034de74f2ef5abc0dae9053 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Fri, 22 Jul 2022 14:17:56 +0200 Subject: [PATCH 11/22] fixing path, --- scripts/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index e5b59047b0..5647ffa906 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -1010,7 +1010,7 @@ function Copy-CodeCoverage-Package-Artifacts { $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$visualStudioTelemetryVersion\lib\$TPB_TargetFrameworkNS20" $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$visualStudioRemoteControlVersion\lib\$TPB_TargetFrameworkNS20" $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$visualStudioUtilitiesInternalVersion\lib\$TPB_TargetFrameworkNS20" - $win32RegistryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$win32RegistryVersion\lib\$TPB_TargetFrameworkNS20" + $win32RegistryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Win32.Registry\$win32RegistryVersion\lib\$TPB_TargetFrameworkNS20" $microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\") $microsoftCodeCoverageExtensionsPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage.Extensions\") From 8e4fc2a4bfc83fd70334baf7e279cfe4f5a853a1 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Fri, 22 Jul 2022 15:08:48 +0200 Subject: [PATCH 12/22] updating version, --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1d6dcdefe8..51cb2c8d61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -88,6 +88,6 @@ 16.4.78 16.3.44 16.3.36 - 6.0.0-preview.5.21301.5 + 5.0.0 From df04fb7ff008976400696b8fe0ce0ff76fdc24e2 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Mon, 25 Jul 2022 11:58:21 +0200 Subject: [PATCH 13/22] updating version, --- eng/Versions.props | 4 ++-- scripts/build.ps1 | 4 ++-- src/package/external/external.csproj | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 51cb2c8d61..ecafeedb70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,12 +82,12 @@ JS etc.) is risky. This can break setup authoring and cause runtime failures in workloads where Rolsyn is not installed. --> 3.8.0-3.20427.2 - 17.4.2-beta.22371.4 + 17.4.3-beta.22375.1 0.2.0-preview.21508.1 5.0.0-preview.21508.1 16.4.78 16.3.44 16.3.36 - 5.0.0 + 5.0.0 diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 5647ffa906..c1bb7e4863 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -997,16 +997,16 @@ function Copy-CodeCoverage-Package-Artifacts { $visualStudioTelemetryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioTelemetryVersion $visualStudioRemoteControlVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioRemoteControlVersion $visualStudioUtilitiesInternalVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioUtilitiesInternalVersion - $win32RegistryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftWin32Registry + $win32RegistryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftWin32RegistryVersion $traceDataCollectorPackagesNetFxDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.TraceDataCollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework472" $internalCodeCoveragePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\" $codeCoverageCorePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.core\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" $codeCoverageInterprocessPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.interprocess\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" $codeCoverageInstrumentationPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.instrumentation\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" - $codeCoverageTelemetryPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.telemetry\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" $codeCoverageImUbuntuPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\ubuntu" $codeCoverageImAlpinePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\alpine" $codeCoverageImMacosPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\macos" + $codeCoverageTelemetryPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.telemetry\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$visualStudioTelemetryVersion\lib\$TPB_TargetFrameworkNS20" $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$visualStudioRemoteControlVersion\lib\$TPB_TargetFrameworkNS20" $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$visualStudioUtilitiesInternalVersion\lib\$TPB_TargetFrameworkNS20" diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 60975ff92e..8363b74332 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -59,7 +59,7 @@ - + From e48a21257994223f3cf09429df8bd6d5f4feb2d2 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Mon, 25 Jul 2022 16:14:30 +0200 Subject: [PATCH 14/22] upgrading System.Runtime.CompilerServices.Unsafe.dll version, --- eng/Versions.props | 2 +- scripts/build.ps1 | 3 +++ scripts/verify-nupkgs.ps1 | 2 +- src/package/external/external.csproj | 1 + src/package/nuspec/Microsoft.CodeCoverage.nuspec | 1 + src/package/nuspec/Microsoft.TestPlatform.nuspec | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ecafeedb70..885365a5b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,7 +54,7 @@ 4.5.1 4.4.0 1.4.2 - 4.5.0 + 6.0.0 4.5.1 4.5.1 4.4.0 diff --git a/scripts/build.ps1 b/scripts/build.ps1 index a0ba408964..445cb607d0 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -1125,6 +1125,7 @@ function Copy-CodeCoverage-Package-Artifacts { $visualStudioRemoteControlVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioRemoteControlVersion $visualStudioUtilitiesInternalVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioUtilitiesInternalVersion $win32RegistryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftWin32RegistryVersion + $systemRuntimeCompilerServicesUnsafeVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.SystemRuntimeCompilerServicesUnsafeVersion $traceDataCollectorPackagesNetFxDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.TraceDataCollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework472" $internalCodeCoveragePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\" $codeCoverageCorePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.core\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" @@ -1138,6 +1139,7 @@ function Copy-CodeCoverage-Package-Artifacts { $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$visualStudioRemoteControlVersion\lib\$TPB_TargetFrameworkNS20" $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$visualStudioUtilitiesInternalVersion\lib\$TPB_TargetFrameworkNS20" $win32RegistryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Win32.Registry\$win32RegistryVersion\lib\$TPB_TargetFrameworkNS20" + $systemRuntimeCompilerServicesUnsafeDirectory = Join-Path $env:TP_PACKAGES_DIR "System.Runtime.CompilerServices.Unsafe\$systemRuntimeCompilerServicesUnsafeVersion\lib\$TPB_TargetFrameworkNS20" $microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\") $microsoftCodeCoverageExtensionsPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage.Extensions\") @@ -1157,6 +1159,7 @@ function Copy-CodeCoverage-Package-Artifacts { Copy-Item $visualStudioRemoteControl\Microsoft.VisualStudio.RemoteControl.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $visualStudioUtilitiesDirectory\Microsoft.VisualStudio.Utilities.Internal.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $win32RegistryDirectory\Microsoft.Win32.Registry.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $systemRuntimeCompilerServicesUnsafeDirectory\System.Runtime.CompilerServices.Unsafe.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $internalCodeCoveragePackagesDir\CodeCoverage $microsoftCodeCoveragePackageDir -Force -Recurse Copy-Item $internalCodeCoveragePackagesDir\InstrumentationEngine $microsoftCodeCoveragePackageDir -Force -Recurse Copy-Item $internalCodeCoveragePackagesDir\Shim $microsoftCodeCoveragePackageDir -Force -Recurse diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1 index f426035370..2b23570598 100644 --- a/scripts/verify-nupkgs.ps1 +++ b/scripts/verify-nupkgs.ps1 @@ -14,7 +14,7 @@ function Verify-Nuget-Packages($packageDirectory, $version) $expectedNumOfFiles = @{ "Microsoft.CodeCoverage" = 62; "Microsoft.NET.Test.Sdk" = 24; - "Microsoft.TestPlatform" = 604; + "Microsoft.TestPlatform" = 605; "Microsoft.TestPlatform.Build" = 21; "Microsoft.TestPlatform.CLI" = 498; "Microsoft.TestPlatform.Extensions.TrxLogger" = 35; diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 8363b74332..93ac3cee4b 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -60,6 +60,7 @@ + diff --git a/src/package/nuspec/Microsoft.CodeCoverage.nuspec b/src/package/nuspec/Microsoft.CodeCoverage.nuspec index 7ace1ca6d7..75b7bb0bbd 100644 --- a/src/package/nuspec/Microsoft.CodeCoverage.nuspec +++ b/src/package/nuspec/Microsoft.CodeCoverage.nuspec @@ -41,6 +41,7 @@ + diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec index 9231c31412..a916ef3a90 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.nuspec +++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec @@ -257,6 +257,7 @@ + From f795224d1c6c4cfba07d985bfbe7a093e1a4c15d Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Mon, 25 Jul 2022 16:29:47 +0200 Subject: [PATCH 15/22] correcting count, --- scripts/verify-nupkgs.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1 index 2b23570598..32fe7e7945 100644 --- a/scripts/verify-nupkgs.ps1 +++ b/scripts/verify-nupkgs.ps1 @@ -12,7 +12,7 @@ function Verify-Nuget-Packages($packageDirectory, $version) { Write-Log "Starting Verify-Nuget-Packages." $expectedNumOfFiles = @{ - "Microsoft.CodeCoverage" = 62; + "Microsoft.CodeCoverage" = 63; "Microsoft.NET.Test.Sdk" = 24; "Microsoft.TestPlatform" = 605; "Microsoft.TestPlatform.Build" = 21; From 20237caa232f8eacdbc53ca68d431e4fc1535591 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Mon, 25 Jul 2022 16:36:21 +0200 Subject: [PATCH 16/22] updating version, --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 885365a5b5..51f79351e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,7 +54,7 @@ 4.5.1 4.4.0 1.4.2 - 6.0.0 + 5.0.0 4.5.1 4.5.1 4.4.0 From 2682a1e1ffd096e537c1a0c14bc87ecfcbb44e8a Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Mon, 25 Jul 2022 16:50:43 +0200 Subject: [PATCH 17/22] updating cc version, --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 51f79351e4..dad1e6937f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,7 +82,7 @@ JS etc.) is risky. This can break setup authoring and cause runtime failures in workloads where Rolsyn is not installed. --> 3.8.0-3.20427.2 - 17.4.3-beta.22375.1 + 17.4.3-beta.22375.3 0.2.0-preview.21508.1 5.0.0-preview.21508.1 16.4.78 From 121de487d4d6b1ab6436ad09b15481cfd06b0619 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Tue, 26 Jul 2022 11:39:15 +0200 Subject: [PATCH 18/22] getting libs directly from cc internal package, --- eng/Versions.props | 6 +--- scripts/build.ps1 | 30 ++++++------------- scripts/verify-nupkgs.ps1 | 2 +- .../nuspec/Microsoft.CodeCoverage.nuspec | 6 ---- 4 files changed, 11 insertions(+), 33 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index dad1e6937f..efe71ff6fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,12 +82,8 @@ JS etc.) is risky. This can break setup authoring and cause runtime failures in workloads where Rolsyn is not installed. --> 3.8.0-3.20427.2 - 17.4.3-beta.22375.3 + 17.4.3-beta.22376.5 0.2.0-preview.21508.1 5.0.0-preview.21508.1 - 16.4.78 - 16.3.44 - 16.3.36 - 5.0.0 diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 445cb607d0..a09db5fd76 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -812,12 +812,9 @@ function Publish-Package { New-Item $testPlatformDirectory -Type Directory -Force | Out-Null } - $visualStudioTelemetryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioTelemetryVersion - $visualStudioRemoteControlVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioRemoteControlVersion - $visualStudioUtilitiesInternalVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioUtilitiesInternalVersion - $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$visualStudioTelemetryVersion\lib\net45" - $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$visualStudioRemoteControlVersion\lib\net45" - $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$visualStudioUtilitiesInternalVersion\lib\net45" + $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\16.3.58\lib\net45" + $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\16.3.23\lib\net45" + $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\16.3.23\lib\net45" Copy-Item "$visualStudioTelemetryDirectory\Microsoft.VisualStudio.Telemetry.dll" $testPlatformDirectory -Force Copy-Item "$visualStudioRemoteControl\Microsoft.VisualStudio.RemoteControl.dll" $testPlatformDirectory -Force @@ -1121,11 +1118,6 @@ function Copy-CodeCoverage-Package-Artifacts { # Copy TraceDataCollector to Microsoft.CodeCoverage folder. $codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftInternalCodeCoverageVersion $traceDataCollectorPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.tracedatacollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" - $visualStudioTelemetryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioTelemetryVersion - $visualStudioRemoteControlVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioRemoteControlVersion - $visualStudioUtilitiesInternalVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioUtilitiesInternalVersion - $win32RegistryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftWin32RegistryVersion - $systemRuntimeCompilerServicesUnsafeVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.SystemRuntimeCompilerServicesUnsafeVersion $traceDataCollectorPackagesNetFxDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.TraceDataCollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework472" $internalCodeCoveragePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\" $codeCoverageCorePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.core\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" @@ -1135,11 +1127,7 @@ function Copy-CodeCoverage-Package-Artifacts { $codeCoverageImAlpinePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\alpine" $codeCoverageImMacosPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\macos" $codeCoverageTelemetryPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.telemetry\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" - $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$visualStudioTelemetryVersion\lib\$TPB_TargetFrameworkNS20" - $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$visualStudioRemoteControlVersion\lib\$TPB_TargetFrameworkNS20" - $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$visualStudioUtilitiesInternalVersion\lib\$TPB_TargetFrameworkNS20" - $win32RegistryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Win32.Registry\$win32RegistryVersion\lib\$TPB_TargetFrameworkNS20" - $systemRuntimeCompilerServicesUnsafeDirectory = Join-Path $env:TP_PACKAGES_DIR "System.Runtime.CompilerServices.Unsafe\$systemRuntimeCompilerServicesUnsafeVersion\lib\$TPB_TargetFrameworkNS20" + $telemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "$internalCodeCoveragePackagesDir\Microsoft.VisualStudio.Telemetry" $microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\") $microsoftCodeCoverageExtensionsPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage.Extensions\") @@ -1155,11 +1143,11 @@ function Copy-CodeCoverage-Package-Artifacts { Copy-Item $codeCoverageInstrumentationPackagesDir\Mono.Cecil.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $codeCoverageInstrumentationPackagesDir\Mono.Cecil.Pdb.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $codeCoverageTelemetryPackagesDir\Microsoft.CodeCoverage.Telemetry.dll $microsoftCodeCoveragePackageDir -Force - Copy-Item $visualStudioTelemetryDirectory\Microsoft.VisualStudio.Telemetry.dll $microsoftCodeCoveragePackageDir -Force - Copy-Item $visualStudioRemoteControl\Microsoft.VisualStudio.RemoteControl.dll $microsoftCodeCoveragePackageDir -Force - Copy-Item $visualStudioUtilitiesDirectory\Microsoft.VisualStudio.Utilities.Internal.dll $microsoftCodeCoveragePackageDir -Force - Copy-Item $win32RegistryDirectory\Microsoft.Win32.Registry.dll $microsoftCodeCoveragePackageDir -Force - Copy-Item $systemRuntimeCompilerServicesUnsafeDirectory\System.Runtime.CompilerServices.Unsafe.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $telemetryDirectory\Microsoft.VisualStudio.Telemetry.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $telemetryDirectory\Microsoft.VisualStudio.RemoteControl.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $telemetryDirectory\Microsoft.VisualStudio.Utilities.Internal.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $telemetryDirectory\Microsoft.Win32.Registry.dll $microsoftCodeCoveragePackageDir -Force + Copy-Item $telemetryDirectory\System.Runtime.CompilerServices.Unsafe.dll $microsoftCodeCoveragePackageDir -Force Copy-Item $internalCodeCoveragePackagesDir\CodeCoverage $microsoftCodeCoveragePackageDir -Force -Recurse Copy-Item $internalCodeCoveragePackagesDir\InstrumentationEngine $microsoftCodeCoveragePackageDir -Force -Recurse Copy-Item $internalCodeCoveragePackagesDir\Shim $microsoftCodeCoveragePackageDir -Force -Recurse diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1 index 32fe7e7945..c0c677bcda 100644 --- a/scripts/verify-nupkgs.ps1 +++ b/scripts/verify-nupkgs.ps1 @@ -12,7 +12,7 @@ function Verify-Nuget-Packages($packageDirectory, $version) { Write-Log "Starting Verify-Nuget-Packages." $expectedNumOfFiles = @{ - "Microsoft.CodeCoverage" = 63; + "Microsoft.CodeCoverage" = 57; "Microsoft.NET.Test.Sdk" = 24; "Microsoft.TestPlatform" = 605; "Microsoft.TestPlatform.Build" = 21; diff --git a/src/package/nuspec/Microsoft.CodeCoverage.nuspec b/src/package/nuspec/Microsoft.CodeCoverage.nuspec index 75b7bb0bbd..121c92dcb5 100644 --- a/src/package/nuspec/Microsoft.CodeCoverage.nuspec +++ b/src/package/nuspec/Microsoft.CodeCoverage.nuspec @@ -36,12 +36,6 @@ - - - - - - From 78a11210ec0707aedbf40dacbe1c77677fac54f6 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Tue, 26 Jul 2022 11:40:19 +0200 Subject: [PATCH 19/22] removing from external.csproj, --- src/package/external/external.csproj | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 93ac3cee4b..03f1bd6297 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -51,16 +51,14 @@ - - - + + + - - From 3164ffd1a1c18d1c033e6495c6ccb82d415d6f18 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Tue, 26 Jul 2022 11:43:07 +0200 Subject: [PATCH 20/22] fixing, --- eng/Versions.props | 3 +++ scripts/build.ps1 | 9 ++++++--- src/package/external/external.csproj | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index efe71ff6fc..8045ce306d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,5 +85,8 @@ 17.4.3-beta.22376.5 0.2.0-preview.21508.1 5.0.0-preview.21508.1 + 16.4.78 + 16.3.44 + 16.3.36 diff --git a/scripts/build.ps1 b/scripts/build.ps1 index a09db5fd76..1218ec6281 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -812,9 +812,12 @@ function Publish-Package { New-Item $testPlatformDirectory -Type Directory -Force | Out-Null } - $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\16.3.58\lib\net45" - $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\16.3.23\lib\net45" - $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\16.3.23\lib\net45" + $visualStudioTelemetryVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioTelemetryVersion + $visualStudioRemoteControlVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioRemoteControlVersion + $visualStudioUtilitiesInternalVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftVisualStudioUtilitiesInternalVersion + $visualStudioTelemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Telemetry\$visualStudioTelemetryVersion\lib\net45" + $visualStudioRemoteControl = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.RemoteControl\$visualStudioRemoteControlVersion\lib\net45" + $visualStudioUtilitiesDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Utilities.Internal\$visualStudioUtilitiesInternalVersion\lib\net45" Copy-Item "$visualStudioTelemetryDirectory\Microsoft.VisualStudio.Telemetry.dll" $testPlatformDirectory -Force Copy-Item "$visualStudioRemoteControl\Microsoft.VisualStudio.RemoteControl.dll" $testPlatformDirectory -Force diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj index 03f1bd6297..87b21021e9 100644 --- a/src/package/external/external.csproj +++ b/src/package/external/external.csproj @@ -51,9 +51,9 @@ - - - + + + From 85c55c5fac588b605c1276895ab989cf211fe66b Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Tue, 26 Jul 2022 12:01:50 +0200 Subject: [PATCH 21/22] fixing path, --- scripts/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 1218ec6281..2b45e1c8e2 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -1130,7 +1130,7 @@ function Copy-CodeCoverage-Package-Artifacts { $codeCoverageImAlpinePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\alpine" $codeCoverageImMacosPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\macos" $codeCoverageTelemetryPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.telemetry\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20" - $telemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "$internalCodeCoveragePackagesDir\Microsoft.VisualStudio.Telemetry" + $telemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\Microsoft.VisualStudio.Telemetry" $microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\") $microsoftCodeCoverageExtensionsPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage.Extensions\") From cf6ce6946c9859dd0980f25a4f01bbe2a2d3b6e1 Mon Sep 17 00:00:00 2001 From: fhnaseer Date: Tue, 26 Jul 2022 12:51:22 +0200 Subject: [PATCH 22/22] updating cc version, --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7f50d087af..235855e1c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,7 +82,7 @@ JS etc.) is risky. This can break setup authoring and cause runtime failures in workloads where Rolsyn is not installed. --> 3.8.0-3.20427.2 - 17.4.3-beta.22376.5 + 17.4.4-beta.22376.6 0.2.0-preview.21508.1 5.0.0-preview.21508.1 16.4.78