From: Viktor Hofer Date: Sat, 15 Jun 2019 19:27:13 +0000 (+0200) Subject: Enable project restore for test projects (dotnet/corefx#38151) X-Git-Tag: submit/tizen/20210909.063632~11031^2~1276 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f98ba6a2bc13f1ddd7d839139383db3f30cd00d;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Enable project restore for test projects (dotnet/corefx#38151) * Factor out repo restore into seperate props/targets * Use configuration system msbuild sdk * Remove XUnit.Runtime.depproj * Remove TargetGroup usages in test projects * Fix ILLink configuration The ILLink package contains netcoreapp2.0 assets which are compatible with netstandard2.0. Removing the old TargetFramework to restore successfully. * Remove usages from TargetGroup in Directory.Build.props * Remove dead net4* configurations * Change tests.builds to tests.proj sdk proj * Make externals dir proj an sdk project * Consume Microsoft.DotNet.CoreFxTesting as an msbuild sdk * Use runtimeconfig.template.json * Remove SupplementalTestData * Map shared framework version to product version * Stop binplacing tests * Move some tool depprojs to targets during restore * Remove dead code * Use PackageReference instead of RefFromRuntime in test * Disable using an apphost * Copy compression testdata manually cause unicode bug * Remove target batching in optimizationData * Reference packaging tools from CoreFx.Private.TestUtilities Commit migrated from https://github.com/dotnet/corefx/commit/c4c1985531cc1f25c805bbc4801b85c98e0dfee0 --- diff --git a/docs/libraries/building/advanced-inner-loop-testing.md b/docs/libraries/building/advanced-inner-loop-testing.md index fd428d6..53f7959 100644 --- a/docs/libraries/building/advanced-inner-loop-testing.md +++ b/docs/libraries/building/advanced-inner-loop-testing.md @@ -42,7 +42,7 @@ public class Program 3. Copy the just built corefx assemblies into your application directory. When using Visual Studio or the .NET Core SDK Host (`dotnet.exe`) you usually compile against *reference assemblies*. For simplicity we compile against the same assembly set that we use during run time. ``` -xcopy ..\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\9.9.9 runtime /e /i /y /s +xcopy ..\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\$(ProductVersion) runtime /e /i /y /s ``` You don't need all the assemblies that are built by corefx but copying the entire directory makes it easier if you want to reference additional ones. At a minimum, this app will need the following assemblies to run: diff --git a/docs/libraries/coding-guidelines/project-guidelines.md b/docs/libraries/coding-guidelines/project-guidelines.md index 2ea0b6c..a2ddd04 100644 --- a/docs/libraries/coding-guidelines/project-guidelines.md +++ b/docs/libraries/coding-guidelines/project-guidelines.md @@ -22,7 +22,6 @@ once before you can iterate and work on a given library project. - build-test.cmd cannot be ran successfully until build.cmd has been ran at least once for a `BuildConfiguration`. - Build src\tests.builds which builds all applicable test projects. For test project information see [tests](#tests). - The build pass will happen twice. Once for the specific `$(BuildConfiguration)` and once for netstandard. That way we run both sets of applicable tests against for the given `$(BuildConfiguration)`. -- TODO: Currently as part of src/post.builds we call CloudBuild.targets which sets up our test runs. This needs to be moved to be part of build-test.cmd now. ## Behind the scenes with build-packages.cmd/sh - build-packages.cmd cannot be run successfully until build.cmd has been ran at least once for a BuildConfiguration. diff --git a/docs/libraries/debugging/unix-instructions.md b/docs/libraries/debugging/unix-instructions.md index 33c8981..35921ed 100644 --- a/docs/libraries/debugging/unix-instructions.md +++ b/docs/libraries/debugging/unix-instructions.md @@ -57,7 +57,7 @@ lldb should start debugging successfully at this point. You should see stacktrac ##### Example ``` -lldb-3.9 -O "settings set target.exec-search-paths /home/parallels/Downloads/System.Drawing.Common.Tests/home/helixbot/dotnetbuild/work/2a74cf82-3018-4e08-9e9a-744bb492869e/Payload/shared/Microsoft.NETCore.App/9.9.9/" -o "plugin load /home/parallels/Downloads/System.Drawing.Common.Tests/home/helixbot/dotnetbuild/work/2a74cf82-3018-4e08-9e9a-744bb492869e/Payload/shared/Microsoft.NETCore.App/9.9.9/libsosplugin.so" --core /home/parallels/Downloads/System.Drawing.Common.Tests/home/helixbot/dotnetbuild/work/2a74cf82-3018-4e08-9e9a-744bb492869e/Work/f6414a62-9b41-4144-baed-756321e3e075/Unzip/core /home/parallels/Downloads/System.Drawing.Common.Tests/home/helixbot/dotnetbuild/work/2a74cf82-3018-4e08-9e9a-744bb492869e/Payload/shared/Microsoft.NETCore.App/9.9.9/dotnet +lldb-3.9 -O "settings set target.exec-search-paths /home/parallels/Downloads/System.Drawing.Common.Tests/home/helixbot/dotnetbuild/work/2a74cf82-3018-4e08-9e9a-744bb492869e/Payload/shared/Microsoft.NETCore.App/$(ProductVersion)/" -o "plugin load /home/parallels/Downloads/System.Drawing.Common.Tests/home/helixbot/dotnetbuild/work/2a74cf82-3018-4e08-9e9a-744bb492869e/Payload/shared/Microsoft.NETCore.App/$(ProductVersion)/libsosplugin.so" --core /home/parallels/Downloads/System.Drawing.Common.Tests/home/helixbot/dotnetbuild/work/2a74cf82-3018-4e08-9e9a-744bb492869e/Work/f6414a62-9b41-4144-baed-756321e3e075/Unzip/core /home/parallels/Downloads/System.Drawing.Common.Tests/home/helixbot/dotnetbuild/work/2a74cf82-3018-4e08-9e9a-744bb492869e/Payload/shared/Microsoft.NETCore.App/$(ProductVersion)/dotnet ``` ## Using Visual Studio Code diff --git a/eng/Analyzers.props b/eng/Analyzers.props new file mode 100644 index 0000000..f719f65 --- /dev/null +++ b/eng/Analyzers.props @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Packaging.props b/eng/Packaging.props index e0db02c..7e3a26e 100644 --- a/eng/Packaging.props +++ b/eng/Packaging.props @@ -12,11 +12,6 @@ x64 $(MSBuildThisFileDirectory)src/Native/pkg - Microsoft.Private.Intellisense - 3.0.0-preview3-190305-0 - $(NuGetPackageRoot)$(XmlDocPackage.ToLowerInvariant())/$(XmlDocPackageVersion)/xmldocs/netcoreapp - $(ArtifactsBinDir)docs - false diff --git a/eng/configurations/targetgroups.props b/eng/configurations/targetgroups.props index 1daae19..4f16ce3 100644 --- a/eng/configurations/targetgroups.props +++ b/eng/configurations/targetgroups.props @@ -209,6 +209,7 @@ + none net463 diff --git a/eng/depProj.targets b/eng/depProj.targets index ce8fcd6..f200748 100644 --- a/eng/depProj.targets +++ b/eng/depProj.targets @@ -66,7 +66,7 @@ See the LICENSE file in the project root for more information. + Condition="'$(VSDesignTimeBuild)' != 'true'" /> diff --git a/eng/dir.traversal.targets b/eng/dir.traversal.targets index e5f0f1b..f0e8687 100644 --- a/eng/dir.traversal.targets +++ b/eng/dir.traversal.targets @@ -25,33 +25,6 @@ - - - IntegrationTest - PerformanceTest - Test - - - - - - - - - - - - @@ -68,40 +41,8 @@ - - - Clean - - - - - - - - - - - - - BuildAllProjects; - $(TraversalBuildDependsOn); - - - - CleanAllProjects; - $(TraversalCleanDependsOn); - + BuildAllProjects;$(TraversalBuildDependsOn); diff --git a/src/libraries/external/docs/docs.depproj b/eng/restore/docs.targets similarity index 67% rename from src/libraries/external/docs/docs.depproj rename to eng/restore/docs.targets index ea14300..54e44dc 100644 --- a/src/libraries/external/docs/docs.depproj +++ b/eng/restore/docs.targets @@ -1,25 +1,18 @@ - - - $(XmlDocDir) - false - + - - $(XmlDocPackageVersion) - + - + + - + $([System.String]::new('%(RecursiveDir)').TrimEnd('\/')) - - $(XmlDocPackage) - $(XmlDocPackageVersion) @@ -39,10 +32,15 @@ %(Culture)/ - - + + + + \ No newline at end of file diff --git a/eng/restore/illink.targets b/eng/restore/illink.targets new file mode 100644 index 0000000..b79e769 --- /dev/null +++ b/eng/restore/illink.targets @@ -0,0 +1,20 @@ + + + + + + + + + + <_illinkSrcFiles Include="$(NuGetPackageRoot)illink.tasks\$(ILLinkTasksPackageVersion)\tools\**\*" /> + + + + + + diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets new file mode 100644 index 0000000..da5408b --- /dev/null +++ b/eng/restore/optimizationData.targets @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + $(NuGetPackageRoot)%(IBCPackage.Identity)\%(IBCPackage.Version) + + <_optimizationDataSourceFile Include="%(IBCPackage.PackagePath)\**\*.dll;%(IBCPackage.PackagePath)\**\*.ibc" Package="%(IBCPackage.Identity)" /> + + + + + + + diff --git a/eng/restore/repoRestore.props b/eng/restore/repoRestore.props new file mode 100644 index 0000000..c5700dd --- /dev/null +++ b/eng/restore/repoRestore.props @@ -0,0 +1,30 @@ + + + + + unused + + <_excludeRestorePackageImports>$(ExcludeRestorePackageImports) + false + + + + + $(_excludeRestorePackageImports) + + + + + true + + + + + false + false + false + + \ No newline at end of file diff --git a/eng/restore/repoRestore.targets b/eng/restore/repoRestore.targets new file mode 100644 index 0000000..43ee68c --- /dev/null +++ b/eng/restore/repoRestore.targets @@ -0,0 +1,23 @@ + + + + None + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/restore/uap-tools.targets b/eng/restore/uap-tools.targets new file mode 100644 index 0000000..2956bd1 --- /dev/null +++ b/eng/restore/uap-tools.targets @@ -0,0 +1,29 @@ + + + + + + + $(NuGetPackageRoot)$(MicrosoftDotNetUapTestToolsPackageId)\$(MicrosoftDotNetUapTestToolsPackageVersion)\Tools\$(ArchGroup) + + + + + + + + + + + + + + + + diff --git a/src/libraries/Common/tests/StaticTestGenerator/Program.cs b/src/libraries/Common/tests/StaticTestGenerator/Program.cs index 0cfb330..c1d31b1 100644 --- a/src/libraries/Common/tests/StaticTestGenerator/Program.cs +++ b/src/libraries/Common/tests/StaticTestGenerator/Program.cs @@ -274,7 +274,7 @@ namespace StaticTestGenerator // Invalid command line arguments. Console.WriteLine("Usage: "); Console.WriteLine(" Example:"); - Console.WriteLine(@" dotnet run d:\tmpoutput d:\repos\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\9.9.9 d:\repos\corefx\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll"); + Console.WriteLine(@" dotnet run d:\tmpoutput d:\repos\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\$(ProductVersion) d:\repos\corefx\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll"); testAssemblyPath = string.Empty; runtimeAssembliesPath = string.Empty; outputPath = string.Empty; diff --git a/src/libraries/Common/tests/StaticTestGenerator/README.md b/src/libraries/Common/tests/StaticTestGenerator/README.md index af59ef3..eaae275 100644 --- a/src/libraries/Common/tests/StaticTestGenerator/README.md +++ b/src/libraries/Common/tests/StaticTestGenerator/README.md @@ -22,12 +22,12 @@ From within the utility directory, run the utility with the arguments: For example: ``` -dotnet run d:\output "d:\repos\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\9.9.9" "d:\repos\corefx\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll" +dotnet run d:\output "d:\repos\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\3.0.0" "d:\repos\corefx\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll" ``` This will run the tool and result in output written to the console like: ``` 3/27/2019 10:55:37 PM | Test assembly path : d:\repos\corefx\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll -3/27/2019 10:55:37 PM | Helper assemblies path: d:\repos\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\9.9.9\ +3/27/2019 10:55:37 PM | Helper assemblies path: d:\repos\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\3.0.0\ 3/27/2019 10:55:37 PM | Output path : d:\output\System.Runtime.Tests\ 3/27/2019 10:55:37 PM | Xunit arguments : d:\repos\corefx\artifacts\bin\System.Runtime.Tests\netcoreapp-Windows_NT-Debug\System.Runtime.Tests.dll -notrait category=nonnetcoreapptests -notrait category=nonwindowstests -notrait category=IgnoreForCI -notrait category=failing -notrait category=OuterLoop 3/27/2019 10:55:37 PM | diff --git a/src/libraries/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj b/src/libraries/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj index cd3e1e9..446d841 100644 --- a/src/libraries/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj +++ b/src/libraries/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj @@ -1,7 +1,6 @@ {3CF0CC76-4CE0-460A-BA37-657CFED39AB0} - true netstandard-Debug;netstandard-Release @@ -23,4 +22,8 @@ + + + + \ No newline at end of file diff --git a/src/libraries/Common/tests/System/Xml/XmlCoreTest/Configurations.props b/src/libraries/Common/tests/System/Xml/XmlCoreTest/Configurations.props index 581054d..f97cd5e 100644 --- a/src/libraries/Common/tests/System/Xml/XmlCoreTest/Configurations.props +++ b/src/libraries/Common/tests/System/Xml/XmlCoreTest/Configurations.props @@ -1,7 +1,8 @@  - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj b/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj index f631cc2..74a6bd4 100644 --- a/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj +++ b/src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj @@ -4,7 +4,7 @@ Exe XmlCoreTest XmlCoreTest.Common - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/CoreFx.Private.TestUtilities/Directory.Build.props b/src/libraries/CoreFx.Private.TestUtilities/Directory.Build.props index c5ab443..e9e1de5 100644 --- a/src/libraries/CoreFx.Private.TestUtilities/Directory.Build.props +++ b/src/libraries/CoreFx.Private.TestUtilities/Directory.Build.props @@ -1,4 +1,7 @@  + + true + 1.0.1.0 diff --git a/src/libraries/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.csproj b/src/libraries/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.csproj index 338f715..3998c01 100644 --- a/src/libraries/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.csproj +++ b/src/libraries/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.csproj @@ -2,19 +2,20 @@ {E2E59C98-998F-9965-991D-99411166AF6F} false - true - $(RepoRoot)\external\test-runtime\XUnit.Runtime.depproj netcoreapp-Debug;netcoreapp-Release;netstandard-Debug;netstandard-Release;uap-Debug;uap-Release - - + + + + + \ No newline at end of file diff --git a/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj b/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj index e8ba108..0f831be 100644 --- a/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj +++ b/src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj @@ -2,32 +2,25 @@ CoreFx.Private.TestUtilities {EBDB0247-CA43-4226-B7A1-8FEF21061D09} - $(RepoRoot)\external\test-runtime\XUnit.Runtime.depproj false false true $(NoWarn);CS1573 false false - $(NoWarn);CS3021 - Test Utilities are not supported on this platform + $(NoWarn);CS3021 + true + Test Utilities are not supported on this platform netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Unix-Debug;netcoreapp2.0-Unix-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release - - - - - - - - + - - + + @@ -37,6 +30,11 @@ + + + + + @@ -105,25 +103,28 @@ - - - - + - + - + + + + + + + diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 4b144e2..12bf1d2 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -1,16 +1,12 @@ + false true true true - - false - false - false - $(MSBuildThisFileDirectory)CodeAnalysis.ruleset @@ -22,15 +18,37 @@ - + + + + + false + + + - + - + + + false + true + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 77b9bae..fe727d7 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -42,24 +42,8 @@ Microsoft.WorkflowBuildExtensions.targets target that always runs in VS --> - - - None - - - - - - - - - - + diff --git a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj index d5c8a2d..48b12b6 100644 --- a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj +++ b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj @@ -34,10 +34,7 @@ - + - - - \ No newline at end of file diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj index 1234e70..9493b0a 100644 --- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj +++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj @@ -1,8 +1,7 @@ {0657A043-0AEE-445E-9BE4-0B3A9D80318F} - $(DefineConstants);FEATURE_ETLEVENTS - $(DefineConstants);FEATURE_EVENTCOUNTER_DISPOSE + $(DefineConstants);FEATURE_ETLEVENTS;FEATURE_EVENTCOUNTER_DISPOSE $(DefineConstants);USE_MDT_EVENTSOURCE true netfx-Debug;netfx-Release @@ -37,4 +36,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj index 0ba1169..0224d9f 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj +++ b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj @@ -4,21 +4,13 @@ $(DefineConstants);XMLSERIALIZERGENERATORTESTS netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release false + true - true - - - - $(TestAssetsDir)netcoreapp.runtimeconfig.json - $(TestHostRootPath) - - - - $(MSBuildToolsPath)\msbuild.runtimeconfig.json - $(DotNetRoot) + + $(MSBuildToolsPath)\MSBuild.runtimeconfig.json + "$(TestHostRootPath)$([System.IO.Path]::GetFileName('$(DotNetTool)'))" --fx-version $(ProductVersion) + "$(DotNetTool)" @@ -43,12 +35,12 @@ - + $(AssemblyName).XmlSerializers - + diff --git a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj index 56cb9c2..b4f6672 100644 --- a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj +++ b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj @@ -142,7 +142,7 @@ Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs - + diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj b/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj index 03320a1..f1599eb 100644 --- a/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj +++ b/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj index 437ddbf..8498898 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj +++ b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj @@ -125,13 +125,13 @@ - + - + @@ -155,9 +155,7 @@ - - %(RecursiveDir)%(Filename)%(Extension) - + diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj index 8f0a9e4..5eb2839 100644 --- a/src/libraries/System.Console/tests/System.Console.Tests.csproj +++ b/src/libraries/System.Console/tests/System.Console.Tests.csproj @@ -33,9 +33,9 @@ - - %(RecursiveDir)%(Filename)%(Extension) - + @@ -50,7 +50,4 @@ Interop\Unix\System.Native\Interop.Fcntl.cs - - - \ No newline at end of file diff --git a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj index 327e9cb..b90a8b4 100644 --- a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj +++ b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj @@ -20,7 +20,7 @@ Common\Interop\Unix\Interop.Libraries.cs - + Common\Interop\Unix\libdl\Interop.dlopen.cs diff --git a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj index f69086d..277af4a 100644 --- a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj +++ b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj @@ -46,4 +46,7 @@ TDS + + + \ No newline at end of file diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/Configurations.props b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/Configurations.props index 24168e5..929ab11 100644 --- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/Configurations.props +++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/Configurations.props @@ -1,8 +1,10 @@ - netstandard-Unix; - netstandard-Windows_NT; + netcoreapp-Unix; + netcoreapp-Windows_NT; + uap-Windows_NT; + netfx-Windows_NT; \ No newline at end of file diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj index ca39b2e..fb1d695 100644 --- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj +++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressFramework/System.Data.StressFramework.csproj @@ -2,7 +2,7 @@ {518A4E22-0144-4699-80AE-757B744E8E38} Stress.Data - netstandard-Unix-Debug;netstandard-Unix-Release;netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release + netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/Configurations.props b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/Configurations.props index 24168e5..929ab11 100644 --- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/Configurations.props +++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/Configurations.props @@ -1,8 +1,10 @@ - netstandard-Unix; - netstandard-Windows_NT; + netcoreapp-Unix; + netcoreapp-Windows_NT; + uap-Windows_NT; + netfx-Windows_NT; \ No newline at end of file diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj index a4aa433..0b2aa73 100644 --- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj +++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj @@ -3,12 +3,8 @@ {529B187A-DE4F-4F4D-9FBB-D3D416FDB683} DPStressHarness Exe - - false 3021 - netstandard-Unix-Debug;netstandard-Unix-Release;netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release + netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release diff --git a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj index 303ecc4..4db2dc3 100644 --- a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj +++ b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj @@ -8,7 +8,7 @@ netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release true - + @@ -23,7 +23,7 @@ - + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj index 37c4222..84f09f8 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj @@ -4,14 +4,14 @@ true netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release - + - + diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/Configurations.props b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/Configurations.props index 7e0dbee..c19a548 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/Configurations.props +++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/Configurations.props @@ -1,7 +1,8 @@ - netstandard; + netcoreapp; + uap; diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj index 087c715..2874190 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj @@ -2,8 +2,9 @@ {28EB14BE-3BC9-4543-ABA6-A932424DFBD0} Exe + .dll false - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj index 16ed05f..dda8a78 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj @@ -35,14 +35,11 @@ - - - {28eb14be-3bc9-4543-aba6-a932424dfbd0} - System.Diagnostics.FileVersionInfo.TestAssembly - - - - + + + + + diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj index 5243b7b..8d864e6 100644 --- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj +++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj @@ -28,15 +28,15 @@ - - + + - + diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj index 8199e92..14bdb07 100644 --- a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj +++ b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj @@ -25,7 +25,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj index 18e836e..fbfc267 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj +++ b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj @@ -6,7 +6,7 @@ true - + @@ -43,6 +43,6 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj index 0c58d6a..a24e412 100644 --- a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj +++ b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj @@ -2,7 +2,6 @@ {4B93E684-0630-45F4-8F63-6C7788C9892F} true - 1.0.9 true netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release @@ -72,6 +71,12 @@ + + + + + + Common\System\Diagnostics\DebuggerAttributes.cs @@ -86,29 +91,21 @@ - - %(RecursiveDir)%(Filename)%(Extension) - - + + System.Drawing.Tests.48x48_multiple_entries_4bit.ico - + System.Drawing.Tests.bitmap_173x183_indexed_8bit.bmp - + System.Drawing.Tests.empty.file - + System.Drawing.Tests.invalid.ico - + System.Drawing.Tests.Icon_toolboxBitmapAttributeTest - - - - - - \ No newline at end of file diff --git a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj index 45a2f22..2e6caa5 100644 --- a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj +++ b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Properties/runtimeconfig.json b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Properties/runtimeconfig.json deleted file mode 100644 index edf573f..0000000 --- a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Properties/runtimeconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "runtimeOptions": { - "configProperties": { - "Switch.System.Globalization.EnforceJapaneseEraYearRanges": true - }, - "framework": { - "name": "Microsoft.NETCore.App", - "version": "9.9.9" - } - } -} \ No newline at end of file diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj index b6ba861..7231658 100644 --- a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj +++ b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj @@ -3,8 +3,6 @@ {77BE33BB-790D-4D0C-9336-E073001CBD15} netcoreapp-Debug;netcoreapp-Release true - - $(AppDesignerFolder)/runtimeconfig.json diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/runtimeconfig.template.json b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/runtimeconfig.template.json new file mode 100644 index 0000000..1cfef3c --- /dev/null +++ b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/runtimeconfig.template.json @@ -0,0 +1,5 @@ +{ + "configProperties": { + "Switch.System.Globalization.EnforceJapaneseEraYearRanges": true + } +} \ No newline at end of file diff --git a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj index a3c0f66..118c7b7 100644 --- a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj +++ b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj @@ -105,7 +105,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj b/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj index bef4380..78b113e 100644 --- a/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj +++ b/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj @@ -3,11 +3,6 @@ {9A8926D9-1D4C-4069-8965-A626F6CA8C29} netcoreapp-Debug;netcoreapp-Release true - - $(AppDesignerFolder)/runtimeconfig.json diff --git a/src/libraries/System.Globalization/tests/Invariant/Properties/runtimeconfig.json b/src/libraries/System.Globalization/tests/Invariant/Properties/runtimeconfig.json deleted file mode 100644 index 41d1a2f..0000000 --- a/src/libraries/System.Globalization/tests/Invariant/Properties/runtimeconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "runtimeOptions": { - "configProperties": { - "System.Globalization.Invariant": true - }, - "framework": { - "name": "Microsoft.NETCore.App", - "version": "9.9.9" - } - } -} diff --git a/src/libraries/System.Globalization/tests/Invariant/runtimeconfig.template.json b/src/libraries/System.Globalization/tests/Invariant/runtimeconfig.template.json new file mode 100644 index 0000000..dd404e1 --- /dev/null +++ b/src/libraries/System.Globalization/tests/Invariant/runtimeconfig.template.json @@ -0,0 +1,5 @@ +{ + "configProperties": { + "System.Globalization.Invariant": true + } +} \ No newline at end of file diff --git a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj index c740b70..cc54800 100644 --- a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj +++ b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj @@ -1,7 +1,7 @@ {BC2E1649-291D-412E-9529-EDDA94FA7AD6} - $(DefineConstants);STREAM_MEMORY_OVERLOADS_AVAILABLE + $(DefineConstants);STREAM_MEMORY_OVERLOADS_AVAILABLE netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release @@ -27,9 +27,12 @@ Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + - - %(RecursiveDir)%(Filename)%(Extension) - + + \ No newline at end of file diff --git a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj index 7615b20..bdf55c3 100644 --- a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj +++ b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj @@ -31,12 +31,15 @@ Common\System\IO\Compression\ZipTestHelper.cs - + + - - %(RecursiveDir)%(Filename)%(Extension) - + + \ No newline at end of file diff --git a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj index cde91e5..3c0bd87 100644 --- a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj +++ b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj @@ -48,9 +48,12 @@ Common\CoreLib\System\Threading\Tasks\TaskToApm.cs + - - %(RecursiveDir)%(Filename)%(Extension) - + + \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj index 5339d91..750ea26 100644 --- a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj +++ b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj @@ -33,7 +33,7 @@ - + @@ -176,7 +176,7 @@ Common\System\IO\PathFeatures.cs - + diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj index 8867df8..70fc60c 100644 --- a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj +++ b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj @@ -3,28 +3,28 @@ {BF4F9507-8FBD-45EA-81C9-3ED89C052C91} netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release - + - + Internals\Helper.Win32Unix.cs - + Internals\Helper.Win32.cs - + Internals\Helper.Unix.cs - + Internals\Helper.WinRT.cs @@ -65,7 +65,7 @@ - + diff --git a/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj b/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj index f65cc6a..dfe6d0a 100644 --- a/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj +++ b/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj index e315b58..0b4c813 100644 --- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj +++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj @@ -57,15 +57,15 @@ Common\Interop\Windows\Interop.MaxLengths.cs - + - + - + @@ -74,11 +74,11 @@ - + - + diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj b/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj index 97292e9..018bea4 100644 --- a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj +++ b/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj @@ -15,9 +15,9 @@ - + - + diff --git a/src/libraries/System.IO/tests/System.IO.Tests.csproj b/src/libraries/System.IO/tests/System.IO.Tests.csproj index 0fcb607..c806e97 100644 --- a/src/libraries/System.IO/tests/System.IO.Tests.csproj +++ b/src/libraries/System.IO/tests/System.IO.Tests.csproj @@ -8,7 +8,7 @@ netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release - + @@ -18,45 +18,45 @@ - + - + - + - + - + - + - - - - + + + + - + - + - + - + Common\System\Buffers\NativeMemoryManager.cs @@ -71,9 +71,9 @@ - + - + \ No newline at end of file diff --git a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index 1d171e7..3f0cc48 100644 --- a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -272,6 +272,6 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj index 0868111..bfa8f0f 100644 --- a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj +++ b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj @@ -3,7 +3,7 @@ {7B88D79B-B799-4116-A7D0-AED572540CD4} netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release - + diff --git a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj index e3f1ae7..61974a5 100644 --- a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj +++ b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj @@ -2,7 +2,7 @@ true {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F} - true + true true true netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release @@ -251,7 +251,7 @@ - + diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index 7ed7af6..71741d7 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -172,7 +172,7 @@ - + diff --git a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj index 0556184..642158b 100644 --- a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj +++ b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj @@ -44,6 +44,6 @@ - + diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index 4838473..78b3b08 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -157,6 +157,6 @@ - + diff --git a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj index 7d072a7..a8d6466 100644 --- a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj +++ b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj @@ -7,8 +7,7 @@ - - + \ No newline at end of file diff --git a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj index ba5d73d..2926ff5 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj +++ b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj @@ -49,7 +49,7 @@ - + @@ -58,12 +58,12 @@ - + - + diff --git a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj index a1b36fe..5180b417 100644 --- a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj +++ b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj index 1bde739..9d168bf 100644 --- a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj +++ b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj @@ -43,7 +43,7 @@ Common\System\Diagnostics\DebuggerAttributes.cs - + diff --git a/src/libraries/external/test-runtime/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/Properties/Configurations.props similarity index 68% rename from src/libraries/external/test-runtime/Configurations.props rename to src/libraries/System.Private.Xml.Linq/tests/Properties/Configurations.props index 824ac0f..3af3d19 100644 --- a/src/libraries/external/test-runtime/Configurations.props +++ b/src/libraries/System.Private.Xml.Linq/tests/Properties/Configurations.props @@ -1,10 +1,8 @@ - + - uap; - netstandard; - netfx; netcoreapp; + uap; - + \ No newline at end of file diff --git a/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj index 7010ac8..131eb31 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj +++ b/src/libraries/System.Private.Xml.Linq/tests/Properties/System.Xml.Linq.Properties.Tests.csproj @@ -1,7 +1,7 @@ {D24E2563-7A46-4368-94D4-B3A39E9EF1B5} - Debug;Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/external/docs/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/Streaming/Configurations.props similarity index 55% rename from src/libraries/external/docs/Configurations.props rename to src/libraries/System.Private.Xml.Linq/tests/Streaming/Configurations.props index ff0d415..3af3d19 100644 --- a/src/libraries/external/docs/Configurations.props +++ b/src/libraries/System.Private.Xml.Linq/tests/Streaming/Configurations.props @@ -1,7 +1,8 @@ - + - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj index 5976c7d..5713da7 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj +++ b/src/libraries/System.Private.Xml.Linq/tests/Streaming/System.Xml.Linq.Streaming.Tests.csproj @@ -1,7 +1,7 @@ {CB11B315-2567-4574-977D-89E3135243C4} - Debug;Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/external/optimizationData/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/Configurations.props similarity index 55% rename from src/libraries/external/optimizationData/Configurations.props rename to src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/Configurations.props index ff0d415..3af3d19 100644 --- a/src/libraries/external/optimizationData/Configurations.props +++ b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/Configurations.props @@ -1,7 +1,8 @@ - + - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj index 020a286..0b71ee4 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj +++ b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj @@ -1,7 +1,7 @@ {10EFE488-FAB4-43DA-847D-FF057BFF52AC} - Debug;Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props index 581054d..f97cd5e 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props +++ b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props @@ -1,7 +1,8 @@  - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj index ead0ff2..e3fd256 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj +++ b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj @@ -3,7 +3,7 @@ {52666206-B6C9-49FA-A1D7-D0A0C68807B0} XDocument.Common CoreXml.Test.XLinq - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/external/ILLink/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/Configurations.props similarity index 55% rename from src/libraries/external/ILLink/Configurations.props rename to src/libraries/System.Private.Xml.Linq/tests/xNodeReader/Configurations.props index ff0d415..3af3d19 100644 --- a/src/libraries/external/ILLink/Configurations.props +++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/Configurations.props @@ -1,7 +1,8 @@ - + - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj index 20bf529..4035e2c 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj +++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeReader/System.Xml.Linq.xNodeReader.Tests.csproj @@ -1,7 +1,7 @@ {6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1} - Debug;Release + netcoreapp-Debug;netcoreapp-Release diff --git a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj index a8b186e..c213793 100644 --- a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj @@ -4,9 +4,6 @@ netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release - - - @@ -46,4 +43,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj index c3be4f2..625998e 100644 --- a/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj @@ -5,9 +5,11 @@ - - TestFiles\%(RecursiveDir)%(Filename)%(Extension) - TestFiles\%(RecursiveDir) - + + + \ No newline at end of file diff --git a/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj b/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj index 7bbd6c0..0d9a62e 100644 --- a/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj +++ b/src/libraries/System.Private.Xml/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj @@ -2,7 +2,7 @@ {F05DE950-CA99-42A8-B44D-E7DAA5C3C783} XmlReaderTest.Common - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj index fec1b16c..b8b8948 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj @@ -38,9 +38,11 @@ Common\System\IO\TempDirectory.cs - - TestFiles\%(RecursiveDir)%(Filename)%(Extension) - TestFiles\%(RecursiveDir) - + + + \ No newline at end of file diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj index b7a52e9..998c0f4 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj @@ -24,9 +24,11 @@ Common\System\IO\TempDirectory.cs - - TestFiles\%(RecursiveDir)%(Filename)%(Extension) - TestFiles\%(RecursiveDir) - + + + \ No newline at end of file diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj index b1e1684..0e660e1 100644 --- a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj @@ -15,10 +15,12 @@ - - TestFiles\%(RecursiveDir)%(Filename)%(Extension) - TestFiles\%(RecursiveDir) - + + + diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj index 79e694c..359d2fa 100644 --- a/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/System.Xml.Xsl.XslTransformApi.Tests.csproj @@ -17,10 +17,12 @@ - - TestFiles\%(RecursiveDir)%(Filename)%(Extension) - TestFiles\%(RecursiveDir) - + + + diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj b/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj index 2a48d3a..7cc043e 100644 --- a/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj @@ -12,10 +12,12 @@ - - TestFiles\%(RecursiveDir)%(Filename)%(Extension) - TestFiles\%(RecursiveDir) - + + + diff --git a/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj b/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj index f465bba..066c8b3 100644 --- a/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj +++ b/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;uap-Debug;uap-Release true - + diff --git a/src/libraries/System.Reflection/tests/TestExe/Configurations.props b/src/libraries/System.Reflection/tests/TestExe/Configurations.props index 581054d..f97cd5e 100644 --- a/src/libraries/System.Reflection/tests/TestExe/Configurations.props +++ b/src/libraries/System.Reflection/tests/TestExe/Configurations.props @@ -1,7 +1,8 @@  - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj b/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj index f07b8d0..419b1c1 100644 --- a/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj +++ b/src/libraries/System.Reflection/tests/TestExe/System.Reflection.TestExe.csproj @@ -2,7 +2,7 @@ {8C19B991-41E9-4B38-9602-E19375397F1D} Exe - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj index 9b114ad..c786a96 100644 --- a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj +++ b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj @@ -18,9 +18,11 @@ TypeNameComparer.cs - + + + diff --git a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj index 3bb3208..9b35eee 100644 --- a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj +++ b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj @@ -20,8 +20,10 @@ - Common\System\Drawing\Helpers.cs + Common\System\Drawing\Helpers.cs + + false Non-Resx @@ -43,9 +45,18 @@ - - - + + + .exe true - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props index 581054d..f97cd5e 100644 --- a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props +++ b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props @@ -1,7 +1,8 @@  - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj index a37da6b..a6e6dcb 100644 --- a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj +++ b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj @@ -5,7 +5,7 @@ .exe true - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props index 581054d..f97cd5e 100644 --- a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props +++ b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props @@ -1,7 +1,8 @@  - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj index 94e4e83..37a90c2 100644 --- a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj +++ b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj @@ -5,7 +5,7 @@ .exe true - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj index 52c8edd..f2e1c48 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj @@ -99,7 +99,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -139,7 +139,7 @@ - + diff --git a/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj b/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj index 6d78547..3c10f8e 100644 --- a/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj +++ b/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj @@ -14,11 +14,7 @@ PreserveNewest - - - - - - + + \ No newline at end of file diff --git a/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj b/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj index bbad239..a20dd77 100644 --- a/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj +++ b/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj @@ -7,7 +7,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -44,16 +44,16 @@ - + - - + + - + \ No newline at end of file diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj index aa7e04a..7b665f0 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj +++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj @@ -17,7 +17,7 @@ - + @@ -33,7 +33,7 @@ Common\System\ThreadCultureChange.cs - + \ No newline at end of file diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj index fa81407..fb5d157 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj @@ -304,7 +304,7 @@ - + diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj index e3673f2..cd29d2a 100644 --- a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj @@ -123,7 +123,7 @@ - + @@ -132,10 +132,10 @@ Common\Interop\Unix\Interop.Libraries.cs - + - + CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs @@ -270,7 +270,7 @@ CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs - + diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props index 34adfc1..dd6fb5e 100644 --- a/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props +++ b/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props @@ -2,8 +2,6 @@ netcoreapp-Windows_NT; - net462-Windows_NT; - net47-Windows_NT; netfx-Windows_NT; uap-Windows_NT; diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj index 0aef306..87ffb51 100644 --- a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj @@ -92,7 +92,7 @@ CommonTest\System\IO\PositionValueStream.cs - + diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj index 3471016..7031529 100644 --- a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj @@ -39,7 +39,7 @@ CommonTest\System\IO\PositionValueStream.cs - + diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj index 720838d..36c6864 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj @@ -38,7 +38,7 @@ - + @@ -68,10 +68,10 @@ - + - + diff --git a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj index 4418d2d..916c7fd 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 3232de0..bdefaf5 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -2,11 +2,11 @@ {A28B0064-EFB2-4B77-B97C-DECF5DAB074E} true - true - true - $(DefineConstants);NO_DSA_AVAILABLE - $(DefineConstants);NO_EPHEMERALKEYSET_AVAILABLE - $(DefineConstants);HAVE_THUMBPRINT_OVERLOADS + true + true + $(DefineConstants);NO_DSA_AVAILABLE + $(DefineConstants);NO_EPHEMERALKEYSET_AVAILABLE + $(DefineConstants);HAVE_THUMBPRINT_OVERLOADS $(DefineConstants);Unix true netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release @@ -127,6 +127,6 @@ - + diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj b/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj index 1a128f8..037b265 100644 --- a/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj b/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj index 30f3e66..71ab2b3 100644 --- a/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj +++ b/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj b/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj index 223a27e..ee9fc10 100644 --- a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj +++ b/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj @@ -9,14 +9,14 @@ - - + + - + @@ -27,7 +27,7 @@ - + @@ -40,9 +40,9 @@ - + - + diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj index a5388f1..c84d8c5 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj @@ -84,8 +84,6 @@ - - - + diff --git a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj index 861866d..26e86cc3 100644 --- a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj +++ b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj @@ -6,9 +6,9 @@ - + - + diff --git a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj index 166cb5a..096e995 100644 --- a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj +++ b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/Configurations.props b/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/Configurations.props index 581054d..f97cd5e 100644 --- a/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/Configurations.props +++ b/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/Configurations.props @@ -1,7 +1,8 @@  - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj b/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj index e1664a0..84ad827 100644 --- a/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj +++ b/src/libraries/System.Threading.Thread/tests/DefaultApartmentStateMain/DefaultApartmentStateMain.csproj @@ -5,7 +5,7 @@ .exe true {32432E07-5CA4-41F3-9855-22AB1F1E69B3} - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/System.Threading.Thread/tests/MTAMain/Configurations.props b/src/libraries/System.Threading.Thread/tests/MTAMain/Configurations.props index 581054d..f97cd5e 100644 --- a/src/libraries/System.Threading.Thread/tests/MTAMain/Configurations.props +++ b/src/libraries/System.Threading.Thread/tests/MTAMain/Configurations.props @@ -1,7 +1,8 @@  - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj b/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj index 199faab..33bbd27 100644 --- a/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj +++ b/src/libraries/System.Threading.Thread/tests/MTAMain/MTAMain.csproj @@ -5,7 +5,7 @@ .exe true {06B19C7D-9EBE-420F-BD33-137DB18A1FEB} - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/System.Threading.Thread/tests/STAMain/Configurations.props b/src/libraries/System.Threading.Thread/tests/STAMain/Configurations.props index 581054d..f97cd5e 100644 --- a/src/libraries/System.Threading.Thread/tests/STAMain/Configurations.props +++ b/src/libraries/System.Threading.Thread/tests/STAMain/Configurations.props @@ -1,7 +1,8 @@  - netstandard; + netcoreapp; + uap; \ No newline at end of file diff --git a/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj b/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj index efb87a8..e4745c4 100644 --- a/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj +++ b/src/libraries/System.Threading.Thread/tests/STAMain/STAMain.csproj @@ -5,7 +5,7 @@ .exe true {8045E634-C181-4C6C-AE48-71AC18D1C637} - netstandard-Debug;netstandard-Release + netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release diff --git a/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj b/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj index 3caef8d..8c20a2e 100644 --- a/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj +++ b/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj @@ -2,7 +2,7 @@ true {72E9FB32-4692-4692-A10B-9F053F8F1A88} - true + true netcoreapp-Debug;netcoreapp-Release true System diff --git a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj index bd20d5f8..b0836e4 100644 --- a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj +++ b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj @@ -2,9 +2,6 @@ {AC1A1515-70D8-42E4-9B19-A72F739E974C} netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release - 1.0.1 - 1.0.9 - 1.0.2 @@ -26,14 +23,8 @@ - - %(RecursiveDir)%(Filename)%(Extension) - - - %(RecursiveDir)%(Filename)%(Extension) - - - %(RecursiveDir)%(Filename)%(Extension) - + + + diff --git a/src/libraries/build.proj b/src/libraries/build.proj index d881d29..0711f6f 100644 --- a/src/libraries/build.proj +++ b/src/libraries/build.proj @@ -19,11 +19,18 @@ - <_RestoreProjects Include="external\dir.proj" /> + <_RestoreProjects Include="external\dir.proj" Build="true" /> + + + + <_RestoreProjects Include="$(SourceDir)tests.proj" Build="false" /> + + <_RestoreProjects Include="$(SourceDir)CoreFx.Private.TestUtilities\ref\CoreFx.Private.TestUtilities.csproj" Build="false" /> + <_RestoreProjects Include="$(SourceDir)CoreFx.Private.TestUtilities\src\CoreFx.Private.TestUtilities.csproj" Build="false" /> - - + + @@ -44,42 +51,22 @@ - <_TestProjects Include="src\tests.builds" /> + <_TestProjects Include="src\tests.proj" /> + Targets="Build" + Properties="$(ProjectProperties)" /> - <_TestProjects Include="src\tests.builds" /> - - - - - - - - <_TestProjects Include="src\tests.builds" /> - - - - - - - - <_TestProjects Include="src\tests.builds" /> + <_TestProjects Include="src\tests.proj" /> + Targets="Test" + Properties="$(ProjectProperties)" /> @@ -92,17 +79,8 @@ - - - - - - - - - @@ -115,6 +93,5 @@ - - + diff --git a/src/libraries/external/Directory.Build.props b/src/libraries/external/Directory.Build.props index 34efcad7..0b5b07b 100644 --- a/src/libraries/external/Directory.Build.props +++ b/src/libraries/external/Directory.Build.props @@ -1,11 +1,12 @@ + - true $(IntermediateOutputPath) $(RestoreOutputPath)/project.assets.json $(IntermediateOutputPath) + true false diff --git a/src/libraries/external/Directory.Build.targets b/src/libraries/external/Directory.Build.targets index a4460fd..4a99b5d 100644 --- a/src/libraries/external/Directory.Build.targets +++ b/src/libraries/external/Directory.Build.targets @@ -2,7 +2,6 @@ - true true diff --git a/src/libraries/external/ILLink/ILLink.depproj b/src/libraries/external/ILLink/ILLink.depproj deleted file mode 100644 index 7f13db5..0000000 --- a/src/libraries/external/ILLink/ILLink.depproj +++ /dev/null @@ -1,31 +0,0 @@ - - - netcoreapp1.1 - $(ILLinkDir) - false - illink.tasks - 0.1.5-preview-1461378 - - - - $(ILLinkTasksPackageVersion) - - - - - - $(ILLinkTasksPackageId) - $(ILLinkTasksPackageVersion) - /netcoreapp2.0/ - - - - - $(ILLinkTasksPackageId) - $(ILLinkTasksPackageVersion) - /net46/ - - - - diff --git a/src/libraries/external/ILLink/illink.runtimeconfig.json b/src/libraries/external/ILLink/illink.runtimeconfig.json deleted file mode 100644 index 31f899f..0000000 --- a/src/libraries/external/ILLink/illink.runtimeconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "netcoreapp1.1", - "framework": { - "name": "Microsoft.NETCore.App", - "version": "2.0.0" - } - } -} diff --git a/src/libraries/external/binplacePackages/binplacePackages.depproj b/src/libraries/external/binplacePackages/binplacePackages.depproj index 8f19841..8c0b293 100644 --- a/src/libraries/external/binplacePackages/binplacePackages.depproj +++ b/src/libraries/external/binplacePackages/binplacePackages.depproj @@ -29,7 +29,7 @@ - + 4.5.3 @@ -37,7 +37,7 @@ 4.5.0 - + 4.5.2 diff --git a/src/libraries/external/dir.proj b/src/libraries/external/dir.proj index cb86099..e919935 100644 --- a/src/libraries/external/dir.proj +++ b/src/libraries/external/dir.proj @@ -1,5 +1,5 @@ - - + + $(AdditionalBuildConfigurations);netstandard-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup) @@ -13,13 +13,28 @@ - - - - - + + + + + + + + + + + + + + + + diff --git a/src/libraries/external/netcoreapp/netcoreapp.depproj b/src/libraries/external/netcoreapp/netcoreapp.depproj index 545934a..c22e46e 100644 --- a/src/libraries/external/netcoreapp/netcoreapp.depproj +++ b/src/libraries/external/netcoreapp/netcoreapp.depproj @@ -3,9 +3,8 @@ With this, we are able to compile assemblies against shipped, stable versions of .NET Core. --> Reference - 2.0.7 - 2.1.3 - $(TargetGroup) + 2.0.7 + 2.1.3 true diff --git a/src/libraries/external/netfx/netfx.depproj b/src/libraries/external/netfx/netfx.depproj index 8acf4c3..89a96b8 100644 --- a/src/libraries/external/netfx/netfx.depproj +++ b/src/libraries/external/netfx/netfx.depproj @@ -7,7 +7,7 @@ NETStandard.Library.NETFramework 2.0.1-servicing-26011-01 $(NuGetPackageRoot)$(NETStandardSupportPackageId.ToLower())\$(NETStandardSupportPackageVersion)\build - true + true @@ -37,7 +37,7 @@ $(_TargetingPackVersion) - + 4.5.2 @@ -55,10 +55,10 @@ - <_netStandardReference Condition="'$(TargetGroup)' != 'net461' AND '$(TargetGroup)' != 'net462'" + <_netStandardReference Condition="'$(TargetFramework)' != 'net461' AND '$(TargetFramework)' != 'net462'" Include="$(NETStandardSupportRoot)\net47\lib\*.dll" Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net47\lib\%(FileName).dll')" /> - <_netStandardReference Condition="'$(TargetGroup)' != 'net461'" + <_netStandardReference Condition="'$(TargetFramework)' != 'net461'" Include="$(NETStandardSupportRoot)\net462\lib\*.dll" Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net462\lib\%(FileName).dll')" /> <_netStandardReference Include="$(NETStandardSupportRoot)\net461\lib\*.dll" diff --git a/src/libraries/external/optimizationData/optimizationData.depproj b/src/libraries/external/optimizationData/optimizationData.depproj deleted file mode 100644 index 7bdc251..0000000 --- a/src/libraries/external/optimizationData/optimizationData.depproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - $(IbcOptimizationDataDir) - false - - - - - - - - - - - - - - Pkg$([System.String]::new('%(IBCPackage.Identity)').Replace('.', '_')) - - - - - <_ibcPkgSrc>$(%(IBCPackage.PropertyName)) - <_ibcPkgDest>%(IBCPackage.Identity) - - - - - - <_optimizationDataSourceFile Include="$(_ibcPkgSrc)\**\*.dll;$(_ibcPkgSrc)\**\*.ibc" - NuGetPackageId="%(IBCPackage.Identity)" - NuGetPackageVersion="%(IBCPackage.Version)" /> - <_optimizationDataSourceFile SubFolder="$(_ibcPkgDest)\%(RecursiveDir)" /> - - - - - diff --git a/src/libraries/external/runtime/runtime.depproj b/src/libraries/external/runtime/runtime.depproj index 026a8e1..152c888 100644 --- a/src/libraries/external/runtime/runtime.depproj +++ b/src/libraries/external/runtime/runtime.depproj @@ -4,15 +4,19 @@ $(NoWarn);NU1603;NU1605 true - false + false + + + + $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.1.0-b-uwp6-25707-02 + 2.1.0-b-uwp6-25707-02 diff --git a/src/libraries/external/test-runtime/XUnit.Runtime.depproj b/src/libraries/external/test-runtime/XUnit.Runtime.depproj deleted file mode 100644 index a6b9a06..0000000 --- a/src/libraries/external/test-runtime/XUnit.Runtime.depproj +++ /dev/null @@ -1,266 +0,0 @@ - - - netstandard2.0 - - - - - - - win10-$(ArchGroup) - - win10-arm - $(RuntimePath) - xunit.runner.console - xunit.console - xunit.runner.visualstudio - xunit.runner.visualstudio.dotnetcore.testadapter - xunit.runner.visualstudio.uwp.testadapter - xunit.runner.visualstudio.testadapter - microsoft.dotnet.uap.testtools - microsoft.net.test.sdk - microsoft.testplatform.testhost - Microsoft.Diagnostics.Tracing.TraceEvent - testhost - - c# - - $(NoWarn);NU1603;NU1701 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(NETCoreAppTestSharedFrameworkPath) - $(TestHostRootPath) - - - - - - - - - - - $(NuGetPackageRoot)$(MicrosoftDotNetUapTestToolsPackageName)\$(MicrosoftDotNetUapTestToolsPackageVersion)\Tools\$(ArchGroup) - $(UAPToolsFolder.Replace('/', '\')) - - - - - - - - - - - - - - - - - - - - net40 - uap10.0 - netcoreapp1.0 - - - - <_microsoftNetTestSdkAssets Include="$(NuGetPackageRoot)$(MicrosoftNetTestSdkPackageName)\$(MicrosoftNETTestSdkPackageVersion)\build\$(TestSdkTFM)\*.*" /> - - false - $(MicrosoftNetTestSdkPackageName) - $(MicrosoftNETTestSdkPackageVersion) - - - - - - - - - - - - - - - - false - $(MicrosoftDotNetXUnitConsoleRunnerPackage) - $(MicrosoftDotNetXUnitConsoleRunnerPackageVersion) - - - false - $(XUnitTestAdapterPackageId) - $(XUnitPackageVersion) - - - false - $(TestPlatformHostPackageId) - $(MicrosoftNETTestSdkPackageVersion) - - - - - - - - - - - - - false - $(XUnitTestAdapterPackageId) - $(XUnitPackageVersion) - - - false - $(TestPlatformHostPackageId) - $(MicrosoftNETTestSdkPackageVersion) - - - - - - - - - - - - - false - $(XUnitRunnerConsolePackageName) - $(XUnitPackageVersion) - - - false - $(XUnitTestAdapterPackageId) - $(XUnitPackageVersion) - - - - - - - - - - - - false - $(MicrosoftDotNetRemoteExecutorPackage) - $(MicrosoftDotNetRemoteExecutorPackageVersion) - - - - - - diff --git a/src/libraries/external/tools/Configurations.props b/src/libraries/external/tools/Configurations.props index 2870dce..665a8d4 100644 --- a/src/libraries/external/tools/Configurations.props +++ b/src/libraries/external/tools/Configurations.props @@ -1,7 +1,7 @@ - + netstandard; - + \ No newline at end of file diff --git a/src/libraries/external/tools/tools.depproj b/src/libraries/external/tools/tools.depproj index 833a612..579af95 100644 --- a/src/libraries/external/tools/tools.depproj +++ b/src/libraries/external/tools/tools.depproj @@ -1,4 +1,4 @@ - + $(ILAsmToolPath) false @@ -14,4 +14,4 @@ $(MicrosoftNETCoreILAsmPackageVersion) - + \ No newline at end of file diff --git a/src/libraries/post.builds b/src/libraries/post.builds deleted file mode 100644 index 2afceda..0000000 --- a/src/libraries/post.builds +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/libraries/pretest.builds b/src/libraries/pretest.builds index 51fbda1..c4a9e52 100644 --- a/src/libraries/pretest.builds +++ b/src/libraries/pretest.builds @@ -15,7 +15,7 @@ <_TestProjectRootDir Condition="'$(DirectoryToBuild)'!=''">$(DirectoryToBuild) - + diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj index 97c2ed3..fd1d746 100644 --- a/src/libraries/shims/ApiCompat.proj +++ b/src/libraries/shims/ApiCompat.proj @@ -8,10 +8,10 @@ $(MSBuildThisFileDirectory)ApiCompatBaseline.$(TargetGroup).netfx461.ignore.txt $(MSBuildThisFileDirectory)ApiCompatBaseline.$(TargetGroup).netstandard.txt $(MSBuildThisFileDirectory)ApiCompatBaseline.$(TargetGroup).netstandardOnly.txt - $(RefPath) + $(RefPath.TrimEnd('\/')) - $(RuntimePath),$(RefPath) + $(RuntimePath.TrimEnd('\/')),$(RefPath.TrimEnd('\/')) false @@ -55,7 +55,7 @@ - $(NetStandard21RefPath)/netstandard.dll + $(NetStandard21RefPath)netstandard.dll - - + diff --git a/src/libraries/tests.builds b/src/libraries/tests.builds deleted file mode 100644 index 2cf6fd7..0000000 --- a/src/libraries/tests.builds +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - true - true - true - $(TestWorkingDir)**/coverage.xml - $(ArtifactsDir)coverage - - true - MakeCommonResourcesPriFile;$(TraversalBuildDependsOn) - - - - Tests - IntegrationTests - PerformanceTests - <_TestProjectFilter Condition="'$(TestProjectFilter)' != ''">.$(TestProjectFilter) - - <_TestProjectFilter Condition="'$(TestProjectFilter)' == '' or '$(BuildAllTests)' == 'true'">Tests - - - - - - - - - - - - - - diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj new file mode 100644 index 0000000..f3d79f5 --- /dev/null +++ b/src/libraries/tests.proj @@ -0,0 +1,66 @@ + + + + + true + true + $(ArtifactsBinDir)*.Tests/**/coverage.xml + $(ArtifactsDir)coverage + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +