Skip to content
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.

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

Switching to use a LICENSE expression instead of a file #846

Merged
merged 1 commit into from
May 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions scripts/Build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,6 @@ function Create-NugetPackages {

Copy-Item -Path "$($env:TF_PACKAGES_DIR)\microsoft.testplatform.adapterutilities\$TestPlatformVersion\lib" -Destination "$($stagingDir)\Microsoft.TestPlatform.AdapterUtilities" -Recurse -Force

# Copy over LICENSE file to staging directory
$licenseFilePath = Join-Path $env:TF_ROOT_DIR "LICENSE"
Copy-Item $licenseFilePath $stagingDir -Force

# Call nuget pack on these components.
$nugetExe = Locate-Nuget

Expand Down
7 changes: 2 additions & 5 deletions src/Package/MSTest.Internal.TestFx.Documentation.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<summary>This is a private nuget package that contains the xml documentation files for MSTest V2 Framework.</summary>
<description>This is a private nuget package that contains the xml documentation files for MSTest V2 Framework.</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE</license>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<icon>Icon.png</icon>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand All @@ -24,10 +25,6 @@
<file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\UWP" />
<file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\WinUI" />

<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />

<!-- Icon -->
<file src="Icon.png" target="" />
</files>
Expand Down
7 changes: 2 additions & 5 deletions src/Package/MSTest.TestAdapter.Enu.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
- ASP.NET Core 1.0+ (Visual Studio 2017)
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE</license>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<icon>Icon.png</icon>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand Down Expand Up @@ -78,10 +79,6 @@
<file src="Build\Desktop\MSTest.TestAdapter.targets" target="build\net45\MSTest.TestAdapter.targets" />
<file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\net45\" />

<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />

<!-- Icon -->
<file src="Icon.png" target="" />
</files>
Expand Down
7 changes: 2 additions & 5 deletions src/Package/MSTest.TestAdapter.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
- ASP.NET Core 1.0+ (Visual Studio 2017)
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE</license>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<icon>Icon.png</icon>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand Down Expand Up @@ -83,10 +84,6 @@
<file src="PlatformServices.Desktop\**\*.resources.dll" target="\build\_common\" />
<file src="MSTest.Core\**\*.resources.dll" target="build\_common\" />

<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />

<!-- Icon -->
<file src="Icon.png" target="" />
</files>
Expand Down
7 changes: 2 additions & 5 deletions src/Package/MSTest.TestAdapter.symbols.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
- ASP.NET Core 1.0+ (Visual Studio 2017)
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE</license>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<icon>Icon.png</icon>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand Down Expand Up @@ -103,10 +104,6 @@
<file src="PlatformServices.Desktop\**\*.resources.dll" target="\build\_common\" />
<file src="MSTest.Core\**\*.resources.dll" target="build\_common\" />

<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />

<!-- Icon -->
<file src="Icon.png" target="" />
</files>
Expand Down
7 changes: 2 additions & 5 deletions src/Package/MSTest.TestFramework.enu.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
To discover and execute tests install MSTest.TestAdapter.
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE</license>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<icon>Icon.png</icon>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand Down Expand Up @@ -64,10 +65,6 @@
<file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\net5.0-windows10.0.18362.0" />
<file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0" />

<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />

<!-- Icon -->
<file src="Icon.png" target="" />
</files>
Expand Down
7 changes: 2 additions & 5 deletions src/Package/MSTest.TestFramework.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
To discover and execute tests install MSTest.TestAdapter.
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE</license>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<icon>Icon.png</icon>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand Down Expand Up @@ -72,10 +73,6 @@
<file src="MSTest.Core\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\" />
<file src="Extension.WinUI\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\" />

<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />

<!-- Icon -->
<file src="Icon.png" target="" />
</files>
Expand Down
7 changes: 2 additions & 5 deletions src/Package/MSTest.TestFramework.symbols.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
To discover and execute tests install MSTest.TestAdapter.
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE</license>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<icon>Icon.png</icon>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
Expand Down Expand Up @@ -82,10 +83,6 @@
<!-- Source code -->
<file src="$srcroot$\**\*.cs" target="src" />

<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />

<!-- Icon -->
<file src="Icon.png" target="" />
</files>
Expand Down