Skip to content

Commit 65a8297

Browse files
authored
Build TestPlatform packages in VMR (#15055)
but with the MIT license instead of VS. Fixes dotnet/source-build#4996
1 parent d59ce18 commit 65a8297

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

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

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

1818
<PropertyGroup>
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>
19+
<IsPackable>true</IsPackable>
2120
<NuspecFile>Microsoft.TestPlatform.Portable.nuspec</NuspecFile>
2221
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
2322
<PackageId>Microsoft.TestPlatform.Portable</PackageId>
@@ -32,7 +31,9 @@
3231
</PackageDescription>
3332
<!-- Override default license -->
3433
<PackageLicenseFile>LICENSE_VS.txt</PackageLicenseFile>
35-
<PackageLicenseFullPath>$(SrcPackageFolder)licenses/LICENSE_VS.txt</PackageLicenseFullPath>
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>
3637
</PropertyGroup>
3738

3839
<ItemGroup Label="NuGet">

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

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

1717
<PropertyGroup>
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>
18+
<IsPackable>true</IsPackable>
2019
<NuspecFile>Microsoft.TestPlatform.nuspec</NuspecFile>
2120
<NuspecBasePath>$(OutputPath)</NuspecBasePath>
2221
<PackageId>Microsoft.TestPlatform</PackageId>
@@ -34,7 +33,9 @@
3433
</PackageDescription>
3534
<!-- Override default license -->
3635
<PackageLicenseFile>LICENSE_VS.txt</PackageLicenseFile>
37-
<PackageLicenseFullPath>$(SrcPackageFolder)licenses/LICENSE_VS.txt</PackageLicenseFullPath>
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>
3839
</PropertyGroup>
3940

4041
<ItemGroup Label="NuGet">

0 commit comments

Comments
 (0)