Skip to content

Revert "Build TestPlatform packages in VMR" #15057

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

Merged
merged 1 commit into from
Apr 22, 2025
Merged

Revert "Build TestPlatform packages in VMR" #15057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
</PropertyGroup>

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

<ItemGroup Label="NuGet">
Expand Down
7 changes: 3 additions & 4 deletions src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
</PropertyGroup>

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

<ItemGroup Label="NuGet">
Expand Down