Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CC package update #3881

Merged
merged 26 commits into from
Jul 26, 2022
Merged

CC package update #3881

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5f7486d
adding new libs,
fhnaseer Jul 21, 2022
67181d6
undo,
fhnaseer Jul 21, 2022
ef3da42
revert changes,
fhnaseer Jul 21, 2022
a093ad3
undo changes,
fhnaseer Jul 21, 2022
79e4fd7
adding files to the package,
fhnaseer Jul 22, 2022
b079b3f
fixing stuff,
fhnaseer Jul 22, 2022
7f716a0
fix,
fhnaseer Jul 22, 2022
5fc5e8a
merging main,
fhnaseer Jul 22, 2022
f4054d2
fixing build,
fhnaseer Jul 22, 2022
9b04e52
updating count,
fhnaseer Jul 22, 2022
8096dd3
Adding Win32.Registry project,
fhnaseer Jul 22, 2022
6722611
fixing path,
fhnaseer Jul 22, 2022
8e4fc2a
updating version,
fhnaseer Jul 22, 2022
df04fb7
updating version,
fhnaseer Jul 25, 2022
592a9ec
merging main,
fhnaseer Jul 25, 2022
e48a212
upgrading System.Runtime.CompilerServices.Unsafe.dll version,
fhnaseer Jul 25, 2022
f795224
correcting count,
fhnaseer Jul 25, 2022
20237ca
updating version,
fhnaseer Jul 25, 2022
2682a1e
updating cc version,
fhnaseer Jul 25, 2022
121de48
getting libs directly from cc internal package,
fhnaseer Jul 26, 2022
78a1121
removing from external.csproj,
fhnaseer Jul 26, 2022
3164ffd
fixing,
fhnaseer Jul 26, 2022
4cf303e
Merge remote-tracking branch 'origin/main' into fhnaseer/CC_PackageUp…
fhnaseer Jul 26, 2022
85c55c5
fixing path,
fhnaseer Jul 26, 2022
cf6ce69
updating cc version,
fhnaseer Jul 26, 2022
ce48841
Merge remote-tracking branch 'origin/main' into fhnaseer/CC_PackageUp…
fhnaseer Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<SystemMemoryVersion>4.5.1</SystemMemoryVersion>
<SystemNumericsVectorsVersion>4.4.0</SystemNumericsVectorsVersion>
<SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>4.5.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>5.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemTextEncodingsWebVersion>4.5.1</SystemTextEncodingsWebVersion>
<SystemThreadingTasksExtensionVersion>4.5.1</SystemThreadingTasksExtensionVersion>
<SystemValueTupleVersion>4.4.0</SystemValueTupleVersion>
Expand Down Expand Up @@ -82,8 +82,12 @@
JS etc.) is risky. This can break setup authoring and cause runtime failures in workloads
where Rolsyn is not installed. -->
<MicrosoftCodeAnalysisVersion>3.8.0-3.20427.2</MicrosoftCodeAnalysisVersion>
<MicrosoftInternalCodeCoverageVersion>17.4.3-beta.22374.1</MicrosoftInternalCodeCoverageVersion>
<MicrosoftInternalCodeCoverageVersion>17.4.3-beta.22375.3</MicrosoftInternalCodeCoverageVersion>
<MicrosoftDiagnosticsNETCoreClientVersion>0.2.0-preview.21508.1</MicrosoftDiagnosticsNETCoreClientVersion>
<MicrosoftSourceBuildIntermediatediagnosticsVersion>5.0.0-preview.21508.1</MicrosoftSourceBuildIntermediatediagnosticsVersion>
<MicrosoftVisualStudioTelemetryVersion>16.4.78</MicrosoftVisualStudioTelemetryVersion>
fhnaseer marked this conversation as resolved.
Show resolved Hide resolved
<MicrosoftVisualStudioRemoteControlVersion>16.3.44</MicrosoftVisualStudioRemoteControlVersion>
jakubch1 marked this conversation as resolved.
Show resolved Hide resolved
<MicrosoftVisualStudioUtilitiesInternalVersion>16.3.36</MicrosoftVisualStudioUtilitiesInternalVersion>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
</PropertyGroup>
</Project>
26 changes: 23 additions & 3 deletions scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1118,6 +1121,11 @@ 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"
Expand All @@ -1126,6 +1134,12 @@ 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"
$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"

$microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\")
$microsoftCodeCoverageExtensionsPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage.Extensions\")
Expand All @@ -1140,6 +1154,12 @@ 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 $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 $internalCodeCoveragePackagesDir\CodeCoverage $microsoftCodeCoveragePackageDir -Force -Recurse
Copy-Item $internalCodeCoveragePackagesDir\InstrumentationEngine $microsoftCodeCoveragePackageDir -Force -Recurse
Copy-Item $internalCodeCoveragePackagesDir\Shim $microsoftCodeCoveragePackageDir -Force -Recurse
Expand Down
4 changes: 2 additions & 2 deletions scripts/verify-nupkgs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ function Verify-Nuget-Packages($packageDirectory, $version)
{
Write-Log "Starting Verify-Nuget-Packages."
$expectedNumOfFiles = @{
"Microsoft.CodeCoverage" = 57;
"Microsoft.CodeCoverage" = 63;
"Microsoft.NET.Test.Sdk" = 24;
"Microsoft.TestPlatform" = 599;
"Microsoft.TestPlatform" = 605;
"Microsoft.TestPlatform.Build" = 21;
"Microsoft.TestPlatform.CLI" = 498;
"Microsoft.TestPlatform.Extensions.TrxLogger" = 35;
Expand Down
8 changes: 5 additions & 3 deletions src/package/external/external.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,16 @@
<PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(VSSdkBuildToolsVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(InteropExternalsVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="16.3.58" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.23" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.23" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVisualStudioTelemetryVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.RemoteControl" Version="$(MicrosoftVisualStudioRemoteControlVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Utilities.Internal" Version="$(MicrosoftVisualStudioUtilitiesInternalVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness" Version="$(MicrosoftFakesVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.Internal.Intellitrace.Extensions" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(ILAsmPackageVersion)" />
<PackageReference Include="Microsoft.NETCore.ILDAsm" Version="$(ILAsmPackageVersion)" />
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" PrivateAssets="All" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="All" />
</ItemGroup>
<Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />

Expand Down
6 changes: 6 additions & 0 deletions src/package/nuspec/Microsoft.CodeCoverage.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
<file src="Microsoft.CodeCoverage\Microsoft.CodeCoverage.Core.dll" target="build\netstandard1.0\" />
<file src="Microsoft.CodeCoverage\Microsoft.CodeCoverage.Interprocess.dll" target="build\netstandard1.0\" />
<file src="Microsoft.CodeCoverage\Microsoft.CodeCoverage.Instrumentation.dll" target="build\netstandard1.0\" />
<file src="Microsoft.CodeCoverage\Microsoft.CodeCoverage.Telemetry.dll" target="build\netstandard1.0\" />
fhnaseer marked this conversation as resolved.
Show resolved Hide resolved
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Telemetry.dll" target="build\netstandard1.0\" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.RemoteControl.dll" target="build\netstandard1.0\" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Utilities.Internal.dll" target="build\netstandard1.0\" />
<file src="Microsoft.CodeCoverage\Microsoft.Win32.Registry.dll" target="build\netstandard1.0\" />
<file src="Microsoft.CodeCoverage\System.Runtime.CompilerServices.Unsafe.dll" target="build\netstandard1.0\" />
<file src="Microsoft.CodeCoverage\Mono.Cecil.dll" target="build\netstandard1.0\" />
<file src="Microsoft.CodeCoverage\Mono.Cecil.Pdb.dll" target="build\netstandard1.0\" />

Expand Down
6 changes: 6 additions & 0 deletions src/package/nuspec/Microsoft.TestPlatform.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,12 @@
<file src="Microsoft.CodeCoverage\Mono.Cecil.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.dll" />
<file src="Microsoft.CodeCoverage\Mono.Cecil.Pdb.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.Pdb.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.CodeCoverage.Core.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Core.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.CodeCoverage.Telemetry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Telemetry.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Telemetry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Telemetry.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Utilities.Internal.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Utilities.Internal.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.RemoteControl.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.RemoteControl.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.Win32.Registry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.Win32.Registry.dll" />
<file src="Microsoft.CodeCoverage\System.Runtime.CompilerServices.Unsafe.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\System.Runtime.CompilerServices.Unsafe.dll" />

<file src="net462\$Runtime$\Microsoft.CodeCoverage.IO.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.CodeCoverage.IO.dll" />
<file src="net462\$Runtime$\cs\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.CodeCoverage.IO.dll" />
Expand Down