Skip to content

Commit b1b03ee

Browse files
authored
Revert "Build TestPlatform packages in VMR (#15055)" (#15057)
This reverts commit 65a8297.
1 parent 8c3d294 commit b1b03ee

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj

+3-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
</PropertyGroup>
1717

1818
<PropertyGroup>
19-
<IsPackable>true</IsPackable>
19+
<!-- Don't produce this package when building from source or inside the VMR as it relies on a VS license. -->
20+
<IsPackable Condition="'$(DotNetBuild)' != 'true'">true</IsPackable>
2021
<NuspecFile>Microsoft.TestPlatform.Portable.nuspec</NuspecFile>
2122
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
2223
<PackageId>Microsoft.TestPlatform.Portable</PackageId>
@@ -31,9 +32,7 @@
3132
</PackageDescription>
3233
<!-- Override default license -->
3334
<PackageLicenseFile>LICENSE_VS.txt</PackageLicenseFile>
34-
<!-- Use the MIT license when building from the VMR as the VS license is cloaked out. -->
35-
<PackageLicenseFile Condition="'$(DotNetBuild)' == 'true'">LICENSE_MIT.txt</PackageLicenseFile>
36-
<PackageLicenseFullPath>$(SrcPackageFolder)licenses/$(PackageLicenseFile)</PackageLicenseFullPath>
35+
<PackageLicenseFullPath>$(SrcPackageFolder)licenses/LICENSE_VS.txt</PackageLicenseFullPath>
3736
</PropertyGroup>
3837

3938
<ItemGroup Label="NuGet">

src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
</PropertyGroup>
1616

1717
<PropertyGroup>
18-
<IsPackable>true</IsPackable>
18+
<!-- Don't produce this package when building from source or inside the VMR as it relies on a VS license. -->
19+
<IsPackable Condition="'$(DotNetBuild)' != 'true'">true</IsPackable>
1920
<NuspecFile>Microsoft.TestPlatform.nuspec</NuspecFile>
2021
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
2122
<PackageId>Microsoft.TestPlatform</PackageId>
@@ -33,9 +34,7 @@
3334
</PackageDescription>
3435
<!-- Override default license -->
3536
<PackageLicenseFile>LICENSE_VS.txt</PackageLicenseFile>
36-
<!-- Use the MIT license when building from the VMR as the VS license is cloaked out. -->
37-
<PackageLicenseFile Condition="'$(DotNetBuild)' == 'true'">LICENSE_MIT.txt</PackageLicenseFile>
38-
<PackageLicenseFullPath>$(SrcPackageFolder)licenses/$(PackageLicenseFile)</PackageLicenseFullPath>
37+
<PackageLicenseFullPath>$(SrcPackageFolder)licenses/LICENSE_VS.txt</PackageLicenseFullPath>
3938
</PropertyGroup>
4039

4140
<ItemGroup Label="NuGet">

0 commit comments

Comments
 (0)