Skip to content

Commit

Permalink
Updated externals to pick-up fixes. (#2993)
Browse files Browse the repository at this point in the history
  • Loading branch information
Haplois authored Jul 28, 2021
1 parent b58f6c4 commit b82fdfa
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 14 deletions.
13 changes: 7 additions & 6 deletions scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -502,15 +502,15 @@ function Publish-Package

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

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

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

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

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

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

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

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

# Copy COM Components and their manifests over to Extensions Test Impact directory
$comComponentsDirectoryTIA = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformExternalsVersion\tools\net451"
$comComponentsDirectoryTIA = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\$testPlatformMsDiaVersion\tools\net451"
if (-not (Test-Path $testImpactComComponentsDir)) {
New-Item $testImpactComComponentsDir -Type Directory -Force | Out-Null
}
Expand Down
5 changes: 3 additions & 2 deletions scripts/build/TestPlatform.Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- this version also needs to be "statically" readable because the test fixture will inspect this file for the version
and because during the test `dotnet test` will run and re-build some of the test projects and at that time the version
from a build parameter would not be available, so I am writing this version from the build.ps1 script to keep it in sync -->
<NETTestSdkVersion>16.10.0-dev</NETTestSdkVersion>
<NETTestSdkVersion>16.11.0-dev</NETTestSdkVersion>

<MSTestFrameworkVersion>2.1.0</MSTestFrameworkVersion>
<MSTestAdapterVersion>2.1.0</MSTestAdapterVersion>
Expand All @@ -33,7 +33,8 @@
<JsonNetVersion>9.0.1</JsonNetVersion>
<MoqVersion>4.7.63</MoqVersion>

<TestPlatformExternalsVersion>16.11.31329.17</TestPlatformExternalsVersion>
<TestPlatformExternalsVersion>16.11.31527.49</TestPlatformExternalsVersion>
<TestPlatformMSDiaVersion>16.11.31523.174</TestPlatformMSDiaVersion>
<CodeCoverageExternalsVersion>16.10.0-beta.21270.2</CodeCoverageExternalsVersion>
<MicrosoftFakesVersion>16.11.230815</MicrosoftFakesVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</ItemGroup>

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

<Reference Include="System.Configuration" />
<Reference Include="System" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</ItemGroup>

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

<Reference Include="System.Configuration" />
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions src/package/external/external.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Internal.Dia">
<Version>$(TestPlatformExternalsVersion)</Version>
<Version>$(TestPlatformMSDiaVersion)</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Internal.Dia.Interop">
<Version>$(TestPlatformExternalsVersion)</Version>
<Version>$(TestPlatformMSDiaVersion)</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.VSSDK.BuildTools">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<Reference Include="System.Runtime" />
<Reference Include="Microsoft.CSharp" />

<PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformExternalsVersion)" />
<PackageReference Include="Microsoft.Internal.Dia" Version="$(TestPlatformMSDiaVersion)" />
</ItemGroup>
<ItemGroup>
<Content Include="..\..\packages\microsoft.internal.dia\$(TestPlatformExternalsVersion)\tools\net451\**\*">
<Content Include="..\..\packages\microsoft.internal.dia\$(TestPlatformMSDiaVersion)\tools\net451\**\*">
</Content>
</ItemGroup>
<Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
Expand Down

0 comments on commit b82fdfa

Please sign in to comment.