Skip to content

Commit 1c62432

Browse files
HaploisHaplois
authored
Replaced license file with an expression. (microsoft#846)
- Replaced LICENSE files in NuGet packages with a license expression, and added a licenseUrl.
1 parent eaa3242 commit 1c62432

8 files changed

+14
-39
lines changed

‎scripts/Build.ps1

-4
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,6 @@ function Create-NugetPackages {
240240

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

243-
# Copy over LICENSE file to staging directory
244-
$licenseFilePath = Join-Path $env:TF_ROOT_DIR "LICENSE"
245-
Copy-Item $licenseFilePath $stagingDir -Force
246-
247243
# Call nuget pack on these components.
248244
$nugetExe = Locate-Nuget
249245

‎src/Package/MSTest.Internal.TestFx.Documentation.nuspec

+2-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<summary>This is a private nuget package that contains the xml documentation files for MSTest V2 Framework.</summary>
1111
<description>This is a private nuget package that contains the xml documentation files for MSTest V2 Framework.</description>
1212
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
13-
<license type="file">LICENSE</license>
13+
<license type="expression">MIT</license>
14+
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
1415
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
1516
<icon>Icon.png</icon>
1617
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
@@ -24,10 +25,6 @@
2425
<file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\UWP" />
2526
<file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\WinUI" />
2627

27-
<!-- LICENSE -->
28-
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
29-
<file src="LICENS*" target="" />
30-
3128
<!-- Icon -->
3229
<file src="Icon.png" target="" />
3330
</files>

‎src/Package/MSTest.TestAdapter.Enu.nuspec

+2-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
- ASP.NET Core 1.0+ (Visual Studio 2017)
1818
</description>
1919
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
20-
<license type="file">LICENSE</license>
20+
<license type="expression">MIT</license>
21+
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
2122
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
2223
<icon>Icon.png</icon>
2324
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
@@ -78,10 +79,6 @@
7879
<file src="Build\Desktop\MSTest.TestAdapter.targets" target="build\net45\MSTest.TestAdapter.targets" />
7980
<file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\net45\" />
8081

81-
<!-- LICENSE -->
82-
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
83-
<file src="LICENS*" target="" />
84-
8582
<!-- Icon -->
8683
<file src="Icon.png" target="" />
8784
</files>

‎src/Package/MSTest.TestAdapter.nuspec

+2-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
- ASP.NET Core 1.0+ (Visual Studio 2017)
1818
</description>
1919
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
20-
<license type="file">LICENSE</license>
20+
<license type="expression">MIT</license>
21+
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
2122
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
2223
<icon>Icon.png</icon>
2324
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
@@ -83,10 +84,6 @@
8384
<file src="PlatformServices.Desktop\**\*.resources.dll" target="\build\_common\" />
8485
<file src="MSTest.Core\**\*.resources.dll" target="build\_common\" />
8586

86-
<!-- LICENSE -->
87-
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
88-
<file src="LICENS*" target="" />
89-
9087
<!-- Icon -->
9188
<file src="Icon.png" target="" />
9289
</files>

‎src/Package/MSTest.TestAdapter.symbols.nuspec

+2-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
- ASP.NET Core 1.0+ (Visual Studio 2017)
1818
</description>
1919
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
20-
<license type="file">LICENSE</license>
20+
<license type="expression">MIT</license>
21+
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
2122
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
2223
<icon>Icon.png</icon>
2324
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
@@ -103,10 +104,6 @@
103104
<file src="PlatformServices.Desktop\**\*.resources.dll" target="\build\_common\" />
104105
<file src="MSTest.Core\**\*.resources.dll" target="build\_common\" />
105106

106-
<!-- LICENSE -->
107-
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
108-
<file src="LICENS*" target="" />
109-
110107
<!-- Icon -->
111108
<file src="Icon.png" target="" />
112109
</files>

‎src/Package/MSTest.TestFramework.enu.nuspec

+2-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
To discover and execute tests install MSTest.TestAdapter.
2121
</description>
2222
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
23-
<license type="file">LICENSE</license>
23+
<license type="expression">MIT</license>
24+
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
2425
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
2526
<icon>Icon.png</icon>
2627
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
@@ -64,10 +65,6 @@
6465
<file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\net5.0-windows10.0.18362.0" />
6566
<file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0" />
6667

67-
<!-- LICENSE -->
68-
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
69-
<file src="LICENS*" target="" />
70-
7168
<!-- Icon -->
7269
<file src="Icon.png" target="" />
7370
</files>

‎src/Package/MSTest.TestFramework.nuspec

+2-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
To discover and execute tests install MSTest.TestAdapter.
2121
</description>
2222
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
23-
<license type="file">LICENSE</license>
23+
<license type="expression">MIT</license>
24+
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
2425
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
2526
<icon>Icon.png</icon>
2627
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
@@ -72,10 +73,6 @@
7273
<file src="MSTest.Core\**\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0\" />
7374
<file src="Extension.WinUI\**\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0\" />
7475

75-
<!-- LICENSE -->
76-
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
77-
<file src="LICENS*" target="" />
78-
7976
<!-- Icon -->
8077
<file src="Icon.png" target="" />
8178
</files>

‎src/Package/MSTest.TestFramework.symbols.nuspec

+2-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
To discover and execute tests install MSTest.TestAdapter.
2020
</description>
2121
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
22-
<license type="file">LICENSE</license>
22+
<license type="expression">MIT</license>
23+
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
2324
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
2425
<icon>Icon.png</icon>
2526
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
@@ -82,10 +83,6 @@
8283
<!-- Source code -->
8384
<file src="$srcroot$\**\*.cs" target="src" />
8485

85-
<!-- LICENSE -->
86-
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
87-
<file src="LICENS*" target="" />
88-
8986
<!-- Icon -->
9087
<file src="Icon.png" target="" />
9188
</files>

0 commit comments

Comments
 (0)