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.

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

Jump to bottom

WIP: Remove .txt extension from LICENSE file #781

Merged
merged 2 commits into from
Feb 24, 2021
Merged

WIP: Remove .txt extension from LICENSE file #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfaef92
Remove .txt extension from LICENSE file
3cpt Feb 23, 2021
16d5a01
Fixed the license in nuspec files
Haplois Feb 24, 2021
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
0 LICENSE.txt → LICENSE
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions scripts/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ function Create-NugetPackages {
Copy-Item $tfSrcPackageDir\$file $stagingDir -Force
}

# Copy over LICENSE.txt file to staging directory
$licenseFilePath = Join-Path $env:TF_ROOT_DIR "LICENSE.txt"
# 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.
Expand Down
7 changes: 4 additions & 3 deletions src/Package/MSTest.Internal.TestFx.Documentation.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<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.txt</license>
<license type="file">LICENSE</license>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>MSTest TestFramework MSTestV2</tags>
Expand All @@ -22,7 +22,8 @@
<file src="Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\Desktop" />
<file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\UWP" />

<!-- LICENSE.txt -->
<file src="LICENSE.txt" target="" />
<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />
</files>
</package>
7 changes: 4 additions & 3 deletions src/Package/MSTest.TestAdapter.Dotnet.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>A nuget package targeting running MSTest tests on Dotnet vnext projects.</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE.txt</license>
<license type="file">LICENSE</license>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
Expand All @@ -25,7 +25,8 @@
<!-- Added the below so source navigation works in dotnet-test scenarios -->
<file src="$packagesroot$\Microsoft.Internal.Dia.Interop.14.0.0\lib\net20\msdia140typelib_clr0200.dll" target="lib\net451\" />

<!-- LICENSE.txt -->
<file src="LICENSE.txt" target="" />
<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />
</files>
</package>
7 changes: 4 additions & 3 deletions src/Package/MSTest.TestAdapter.Enu.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
- ASP.NET Core 1.0+ (Visual Studio 2017)
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE.txt</license>
<license type="file">LICENSE</license>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
Expand Down Expand Up @@ -56,7 +56,8 @@
<file src="Build\Desktop\MSTest.TestAdapter.props" target="build\net45\MSTest.TestAdapter.props" />
<file src="Build\Desktop\MSTest.TestAdapter.targets" target="build\net45\MSTest.TestAdapter.targets" />

<!-- LICENSE.txt -->
<file src="LICENSE.txt" target="" />
<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />
</files>
</package>
7 changes: 4 additions & 3 deletions src/Package/MSTest.TestAdapter.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
- ASP.NET Core 1.0+ (Visual Studio 2017)
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE.txt</license>
<license type="file">LICENSE</license>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
Expand Down Expand Up @@ -99,7 +99,8 @@
<file src="Build\Desktop\MSTest.TestAdapter.props" target="build\net45\MSTest.TestAdapter.props" />
<file src="Build\Desktop\MSTest.TestAdapter.targets" target="build\net45\MSTest.TestAdapter.targets" />

<!-- LICENSE.txt -->
<file src="LICENSE.txt" target="" />
<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />
</files>
</package>
7 changes: 4 additions & 3 deletions src/Package/MSTest.TestAdapter.symbols.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
- ASP.NET Core 1.0+ (Visual Studio 2017)
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE.txt</license>
<license type="file">LICENSE</license>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
Expand Down Expand Up @@ -104,7 +104,8 @@
<file src="MSTest.Core\ru\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\ru" />
<file src="MSTest.Core\tr\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="build\_common\tr" />

<!-- LICENSE.txt -->
<file src="LICENSE.txt" target="" />
<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />
</files>
</package>
7 changes: 4 additions & 3 deletions src/Package/MSTest.TestFramework.enu.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
To discover and execute tests for project.json based projects install dotnet-test-mstest.
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE.txt</license>
<license type="file">LICENSE</license>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework </tags>
Expand Down Expand Up @@ -61,7 +61,8 @@
<file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\uap10.0" />
<file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\uap10.0" />

<!-- LICENSE.txt -->
<file src="LICENSE.txt" target="" />
<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />
</files>
</package>
7 changes: 4 additions & 3 deletions src/Package/MSTest.TestFramework.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
To discover and execute tests for project.json based projects install dotnet-test-mstest.
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE.txt</license>
<license type="file">LICENSE</license>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework </tags>
Expand Down Expand Up @@ -145,7 +145,8 @@
<file src="Extension.UWP\ru\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\uap10.0\ru" />
<file src="Extension.UWP\tr\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\uap10.0\tr" />

<!-- LICENSE.txt -->
<file src="LICENSE.txt" target="" />
<!-- LICENSE -->
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
<file src="LICENS*" target="" />
</files>
</package>
7 changes: 4 additions & 3 deletions src/Package/MSTest.TestFramework.symbols.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
To discover and execute tests for project.json based projects install dotnet-test-mstest.
</description>
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
<license type="file">LICENSE.txt</license>
<license type="file">LICENSE</license>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework </tags>
Expand Down Expand Up @@ -59,7 +59,8 @@
<!-- Source code -->
<file src="$srcroot$\**\*.cs" target="src" />

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