From ad520d83c9a6b1d33eaf00438b97ce7e95264e84 Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Wed, 17 Mar 2021 17:16:46 +0100 Subject: [PATCH] Fixed localization package script --- scripts/Build.ps1 | 5 +- scripts/build/TestFx.Loc.targets | 9 ++- src/Package/MSTest.TestAdapter.Enu.nuspec | 17 +++-- src/Package/MSTest.TestAdapter.nuspec | 4 +- src/Package/MSTest.TestAdapter.symbols.nuspec | 36 ++++++++--- src/Package/MSTest.TestFramework.enu.nuspec | 14 ++--- src/Package/MSTest.TestFramework.nuspec | 63 ++++++------------- .../MSTest.TestFramework.symbols.nuspec | 35 +++++++---- 8 files changed, 95 insertions(+), 88 deletions(-) diff --git a/scripts/Build.ps1 b/scripts/Build.ps1 index 34e4d0b560..2f6aa55ed4 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -290,9 +290,8 @@ function Create-NugetPackages { $version = $version + "-" + $versionSuffix } - Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version=$version -Properties Version=$version" - & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion - + Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version``;Srcroot=$env:TF_SRC_DIR``;Packagesroot=$env:TF_PACKAGES_DIR``;TestPlatformVersion=$TestPlatformVersion``;NOWARN=`"NU5127,NU5128,NU5129`"" + & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion`;NOWARN="NU5127,NU5128,NU5129" if ($lastExitCode -ne 0) { throw "Nuget pack failed with an exit code of '$lastExitCode'." } diff --git a/scripts/build/TestFx.Loc.targets b/scripts/build/TestFx.Loc.targets index f151887fd7..16b75c229d 100644 --- a/scripts/build/TestFx.Loc.targets +++ b/scripts/build/TestFx.Loc.targets @@ -70,7 +70,14 @@ - + + <_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath) + + + <_LocalizedFiles Include="$(_SourcePath)\**\*.*" /> + + + diff --git a/src/Package/MSTest.TestAdapter.Enu.nuspec b/src/Package/MSTest.TestAdapter.Enu.nuspec index 1d73a2bddd..b11801ed8a 100644 --- a/src/Package/MSTest.TestAdapter.Enu.nuspec +++ b/src/Package/MSTest.TestAdapter.Enu.nuspec @@ -8,12 +8,12 @@ Microsoft Microsoft - The adapter to discover and execute MSTest Framework based tests. + The adapter to discover and execute MSTest Framework based tests. - Supported platforms: - - .NET 4.5.0+ - - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) - - ASP.NET Core 1.0+ (Visual Studio 2017) + Supported platforms: + - .NET 4.5.0+ + - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) + - ASP.NET Core 1.0+ (Visual Studio 2017) https://github.com/microsoft/testfx LICENSE @@ -36,6 +36,8 @@ + + @@ -72,10 +74,5 @@ - - - - - \ No newline at end of file diff --git a/src/Package/MSTest.TestAdapter.nuspec b/src/Package/MSTest.TestAdapter.nuspec index 82653d4e60..10fa165d3e 100644 --- a/src/Package/MSTest.TestAdapter.nuspec +++ b/src/Package/MSTest.TestAdapter.nuspec @@ -27,7 +27,7 @@ - + @@ -36,6 +36,8 @@ + + diff --git a/src/Package/MSTest.TestAdapter.symbols.nuspec b/src/Package/MSTest.TestAdapter.symbols.nuspec index 66468a31dc..6518467bcb 100644 --- a/src/Package/MSTest.TestAdapter.symbols.nuspec +++ b/src/Package/MSTest.TestAdapter.symbols.nuspec @@ -8,12 +8,12 @@ Microsoft Microsoft - The adapter to discover and execute MSTest Framework based tests. + The adapter to discover and execute MSTest Framework based tests. - Supported platforms: - - .NET 4.5.0+ - - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) - - ASP.NET Core 1.0+ (Visual Studio 2017) + Supported platforms: + - .NET 4.5.0+ + - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) + - ASP.NET Core 1.0+ (Visual Studio 2017) https://github.com/microsoft/testfx LICENSE @@ -26,6 +26,17 @@ + + + + + + + + + + + @@ -36,19 +47,24 @@ - + + + + + + - - + + - - + + diff --git a/src/Package/MSTest.TestFramework.enu.nuspec b/src/Package/MSTest.TestFramework.enu.nuspec index 59aceb62b3..ea3bc49682 100644 --- a/src/Package/MSTest.TestFramework.enu.nuspec +++ b/src/Package/MSTest.TestFramework.enu.nuspec @@ -9,16 +9,16 @@ Microsoft This is MSTest V2, the evolution of Microsoft's Test Framework. - This is MSTest V2, the evolution of Microsoft's Test Framework. + This is MSTest V2, the evolution of Microsoft's Test Framework. - Supported platforms: - - .NET 4.5.0+ - - .NET Core 1.0+ (Universal Windows Apps 10+, DNX Core 5+) - - ASP.NET Core 1.0+ + Supported platforms: + - .NET 4.5.0+ + - .NET Core 1.0+ (Universal Windows Apps 10+) + - ASP.NET Core 1.0+ - To discover and execute tests install MSTest.TestAdapter. + To discover and execute tests install MSTest.TestAdapter. - To discover and execute tests for project.json based projects install dotnet-test-mstest. + To discover and execute tests for project.json based projects install dotnet-test-mstest. https://github.com/microsoft/testfx LICENSE diff --git a/src/Package/MSTest.TestFramework.nuspec b/src/Package/MSTest.TestFramework.nuspec index 4b346dbc5a..d7698b58f9 100644 --- a/src/Package/MSTest.TestFramework.nuspec +++ b/src/Package/MSTest.TestFramework.nuspec @@ -42,63 +42,36 @@ - - - - + + + + - - - - + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/src/Package/MSTest.TestFramework.symbols.nuspec b/src/Package/MSTest.TestFramework.symbols.nuspec index 5712daf681..86d6927aac 100644 --- a/src/Package/MSTest.TestFramework.symbols.nuspec +++ b/src/Package/MSTest.TestFramework.symbols.nuspec @@ -8,16 +8,16 @@ Microsoft Microsoft - This is MSTest V2, the evolution of Microsoft's Test Framework. + This is MSTest V2, the evolution of Microsoft's Test Framework. - Supported platforms: - - .NET 4.5.0+ - - .NET Core 1.0+ (Universal Windows Apps 10+, DNX Core 5+) - - ASP.NET Core 1.0+ + Supported platforms: + - .NET 4.5.0+ + - .NET Core 1.0+ (Universal Windows Apps 10+) + - ASP.NET Core 1.0+ - To discover and execute tests install MSTest.TestAdapter. + To discover and execute tests install MSTest.TestAdapter. - To discover and execute tests for project.json based projects install dotnet-test-mstest. + To discover and execute tests for project.json based projects install dotnet-test-mstest. https://github.com/microsoft/testfx LICENSE @@ -25,6 +25,19 @@ Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework + + + + + + + + + + + + + @@ -36,7 +49,7 @@ - + @@ -47,12 +60,12 @@ - + - + @@ -62,7 +75,7 @@ - +