Skip to content

Commit b82fdfa

Browse files
HaploisHaplois
authored
Updated externals to pick-up fixes. (#2993)
1 parent b58f6c4 commit b82fdfa

File tree

6 files changed

+16
-14
lines changed

6 files changed

+16
-14
lines changed

‎scripts/build.ps1‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -502,15 +502,15 @@ function Publish-Package
502502

503503
################################################################################
504504
# Publish msdia
505-
$testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion
506-
$comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformExternalsVersion\tools\net451"
505+
$testPlatformMSDiaVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformMSDiaVersion
506+
$comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMSDiaVersion\tools\net451"
507507
Copy-Item -Recurse $comComponentsDirectory\* $testhostCore20PackageDir -Force
508508
Copy-Item -Recurse $comComponentsDirectory\* $testhostCore10PackageDir -Force
509509
Copy-Item -Recurse $comComponentsDirectory\* $testhostFullPackageDir -Force
510510
Copy-Item -Recurse $comComponentsDirectory\* $testhostUapPackageDir -Force
511511
Copy-Item -Recurse $comComponentsDirectory\* $coreCLR20TestHostPackageDir -Force
512512

513-
$microsoftInternalDiaInterop = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia.Interop\$testPlatformExternalsVersion\tools\net451"
513+
$microsoftInternalDiaInterop = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia.Interop\$testPlatformMSDiaVersion\tools\net451"
514514
Copy-Item -Recurse $microsoftInternalDiaInterop\* $coreCLR20TestHostPackageDir -Force
515515

516516
# Copy over the logger assemblies to the Extensions folder.
@@ -757,6 +757,7 @@ function Create-VsixPackage
757757
$legacyTestImpactComComponentsDir = Join-Path $extensionsPackageDir "V1\TestImpact"
758758

759759
$testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion
760+
$testPlatformMsDiaVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformMSDiaVersion
760761
$codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.CodeCoverageExternalsVersion
761762

762763
# Copy Microsoft.VisualStudio.TraceDataCollector to Extensions
@@ -807,19 +808,19 @@ function Create-VsixPackage
807808
Copy-Item -Recurse $legacyDir\* $packageDir -Force
808809

809810
# Copy COM Components and their manifests over
810-
$comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformExternalsVersion\tools\net451"
811+
$comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMsDiaVersion\tools\net451"
811812
Copy-Item -Recurse $comComponentsDirectory\* $packageDir -Force
812813

813814
# Copy Microsoft.Internal.Dia.Interop
814-
$internalDiaInterop = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia.Interop\$testPlatformExternalsVersion\tools\net451"
815+
$internalDiaInterop = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia.Interop\$testPlatformMsDiaVersion\tools\net451"
815816
Copy-Item -Recurse $internalDiaInterop\* $packageDir -Force
816817

817818
# Copy VsWebSite.Interop
818819
$vsWebSiteInterop = Join-Path $env:TP_PACKAGES_DIR "VsWebSite.Interop\$testPlatformExternalsVersion\lib\net45"
819820
Copy-Item -Recurse $vsWebSiteInterop\* $packageDir -Force
820821

821822
# Copy COM Components and their manifests over to Extensions Test Impact directory
822-
$comComponentsDirectoryTIA = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformExternalsVersion\tools\net451"
823+
$comComponentsDirectoryTIA = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMsDiaVersion\tools\net451"
823824
if (-not (Test-Path $testImpactComComponentsDir)) {
824825
New-Item $testImpactComComponentsDir -Type Directory -Force | Out-Null
825826
}

‎scripts/build/TestPlatform.Dependencies.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- this version also needs to be "statically" readable because the test fixture will inspect this file for the version
1212
and because during the test `dotnet test` will run and re-build some of the test projects and at that time the version
1313
from a build parameter would not be available, so I am writing this version from the build.ps1 script to keep it in sync -->
14-
<NETTestSdkVersion>16.10.0-dev</NETTestSdkVersion>
14+
<NETTestSdkVersion>16.11.0-dev</NETTestSdkVersion>
1515

1616
<MSTestFrameworkVersion>2.1.0</MSTestFrameworkVersion>
1717
<MSTestAdapterVersion>2.1.0</MSTestAdapterVersion>
@@ -33,7 +33,8 @@
3333
<JsonNetVersion>9.0.1</JsonNetVersion>
3434
<MoqVersion>4.7.63</MoqVersion>
3535

36-
<TestPlatformExternalsVersion>16.11.31329.17</TestPlatformExternalsVersion>
36+
<TestPlatformExternalsVersion>16.11.31527.49</TestPlatformExternalsVersion>
37+
<TestPlatformMSDiaVersion>16.11.31523.174</TestPlatformMSDiaVersion>
3738
<CodeCoverageExternalsVersion>16.10.0-beta.21270.2</CodeCoverageExternalsVersion>
3839
<MicrosoftFakesVersion>16.11.230815</MicrosoftFakesVersion>
3940

‎src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</ItemGroup>
3131

3232
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net45' ">
33-
<PackageReference Include="Microsoft.Internal.Dia.Interop" Version="$(TestPlatformExternalsVersion)" />
33+
<PackageReference Include="Microsoft.Internal.Dia.Interop" Version="$(TestPlatformMSDiaVersion)" />
3434

3535
<Reference Include="System.Configuration" />
3636
<Reference Include="System" />

‎src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</ItemGroup>
3939

4040
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net45' ">
41-
<PackageReference Include="Microsoft.Internal.Dia.Interop" Version="$(TestPlatformExternalsVersion)" />
41+
<PackageReference Include="Microsoft.Internal.Dia.Interop" Version="$(TestPlatformMSDiaVersion)" />
4242

4343
<Reference Include="System.Configuration" />
4444
<Reference Include="System" />

‎src/package/external/external.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@
9090
<PrivateAssets>All</PrivateAssets>
9191
</PackageReference>
9292
<PackageReference Include="Microsoft.Internal.Dia">
93-
<Version>$(TestPlatformExternalsVersion)</Version>
93+
<Version>$(TestPlatformMSDiaVersion)</Version>
9494
<PrivateAssets>All</PrivateAssets>
9595
</PackageReference>
9696
<PackageReference Include="Microsoft.Internal.Dia.Interop">
97-
<Version>$(TestPlatformExternalsVersion)</Version>
97+
<Version>$(TestPlatformMSDiaVersion)</Version>
9898
<PrivateAssets>All</PrivateAssets>
9999
</PackageReference>
100100
<PackageReference Include="Microsoft.VSSDK.BuildTools">

‎test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<Reference Include="System.Runtime" />
1919
<Reference Include="Microsoft.CSharp" />
2020

21-
<PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformExternalsVersion)" />
21+
<PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<Content Include="..\..\packages\microsoft.internal.dia\$(TestPlatformExternalsVersion)\tools\net451\**\*">
24+
<Content Include="..\..\packages\microsoft.internal.dia\$(TestPlatformMSDiaVersion)\tools\net451\**\*">
2525
</Content>
2626
</ItemGroup>
2727
<Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />

0 commit comments

Comments
 (0)