From b37f10a504f20faef2558b6d79180411ad0603c3 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Mon, 2 Nov 2020 14:25:58 -0800 Subject: [PATCH] Changing Windows_NT -> Windows for enabling TargetPlatformMoniker feature of the sdk for platform specific tfms. (#43651) * eng change * coreclr change * libraries change * tests change * installer & mono change * py files changed * .md change * .yml change * remove redundant targetos property * Windows_NT -> windows after ninja change * fixing runtime build failure --- docs/coding-guidelines/interop-guidelines.md | 2 +- docs/coding-guidelines/project-guidelines.md | 8 +- docs/design/coreclr/jit/viewing-jit-dumps.md | 4 +- docs/pr-guide.md | 2 +- docs/project/garbage-collector-guidelines.md | 13 +-- docs/workflow/building/libraries/README.md | 2 +- .../libraries/freebsd-instructions.md | 2 +- docs/workflow/debugging/coreclr/debugging.md | 8 +- .../debugging/libraries/debugging-packages.md | 2 +- .../libraries/windows-instructions.md | 6 +- docs/workflow/editing-and-debugging.md | 2 +- ...unning-aspnet-benchmarks-with-crossgen2.md | 2 +- .../coreclr/windows-test-instructions.md | 12 +-- .../testing/libraries/filtering-tests.md | 2 +- docs/workflow/testing/using-corerun.md | 8 +- docs/workflow/using-dotnet-cli.md | 2 +- eng/Configurations.props | 2 +- eng/Subsets.props | 2 +- eng/build.ps1 | 6 +- eng/build.sh | 8 +- eng/codeOptimization.targets | 2 +- ...ibraries-sdk-aspnetcore.windows.Dockerfile | 2 +- eng/docker/libraries-sdk.windows.Dockerfile | 2 +- eng/illink.targets | 2 +- eng/liveBuilds.targets | 2 +- eng/native/configureplatform.cmake | 4 +- eng/native/functions.cmake | 2 +- eng/pipelines/common/platform-matrix.yml | 24 +++--- .../templates/runtimes/build-test-job.yml | 2 +- .../runtimes/send-to-helix-inner-step.yml | 4 +- eng/pipelines/common/xplat-setup.yml | 8 +- eng/pipelines/coreclr/ci.yml | 16 ++-- eng/pipelines/coreclr/clrinterpreter.yml | 12 +-- eng/pipelines/coreclr/crossgen2-composite.yml | 12 +-- eng/pipelines/coreclr/crossgen2-gcstress.yml | 8 +- eng/pipelines/coreclr/crossgen2-outerloop.yml | 30 +++---- eng/pipelines/coreclr/crossgen2.yml | 8 +- eng/pipelines/coreclr/gc-longrunning.yml | 8 +- eng/pipelines/coreclr/gc-simulator.yml | 8 +- eng/pipelines/coreclr/ilasm.yml | 12 +-- eng/pipelines/coreclr/jit-experimental.yml | 4 +- eng/pipelines/coreclr/jitrollingbuild.yml | 6 +- eng/pipelines/coreclr/jitstress-isas-arm.yml | 4 +- eng/pipelines/coreclr/jitstress-isas-x86.yml | 8 +- eng/pipelines/coreclr/jitstress.yml | 12 +-- .../coreclr/jitstress2-jitstressregs.yml | 12 +-- eng/pipelines/coreclr/jitstressregs-x86.yml | 8 +- eng/pipelines/coreclr/jitstressregs.yml | 12 +-- .../coreclr/libraries-gcstress-extra.yml | 2 +- .../libraries-gcstress0x3-gcstress0xc.yml | 2 +- eng/pipelines/coreclr/libraries-jitstress.yml | 14 ++-- .../libraries-jitstress2-jitstressregs.yml | 14 ++-- .../coreclr/libraries-jitstressregs.yml | 14 ++-- eng/pipelines/coreclr/perf.yml | 12 +-- eng/pipelines/coreclr/r2r.yml | 16 ++-- eng/pipelines/coreclr/runincontext.yml | 8 +- eng/pipelines/coreclr/superpmi.yml | 18 ++-- .../coreclr/templates/build-jit-job.yml | 12 +-- eng/pipelines/coreclr/templates/build-job.yml | 18 ++-- .../coreclr/templates/crossdac-build.yml | 4 +- .../templates/crossgen-comparison-job.yml | 20 ++--- .../crossgen2-comparison-build-job.yml | 10 +-- .../templates/crossgen2-comparison-job.yml | 6 +- .../coreclr/templates/format-job.yml | 6 +- .../coreclr/templates/helix-queues-setup.yml | 16 ++-- eng/pipelines/coreclr/templates/perf-job.yml | 8 +- .../coreclr/templates/run-performance-job.yml | 16 ++-- .../coreclr/templates/run-scenarios-job.yml | 28 +++---- .../coreclr/templates/run-superpmi-job.yml | 4 +- eng/pipelines/coreclr/templates/xplat-job.yml | 4 +- .../coreclr/templates/xplat-pipeline-job.yml | 4 +- eng/pipelines/global-build.yml | 4 +- eng/pipelines/installer/jobs/base-job.yml | 12 +-- eng/pipelines/libraries/base-job.yml | 4 +- .../libraries/helix-queues-setup.yml | 16 ++-- eng/pipelines/libraries/outerloop-mono.yml | 6 +- eng/pipelines/libraries/outerloop.yml | 14 ++-- eng/pipelines/libraries/run-test-job.yml | 4 +- eng/pipelines/mono/templates/build-job.yml | 14 ++-- eng/pipelines/mono/templates/xplat-job.yml | 4 +- eng/pipelines/official/stages/publish.yml | 2 +- eng/pipelines/runtime-linker-tests.yml | 2 +- eng/pipelines/runtime-official.yml | 48 +++++------ eng/pipelines/runtime.yml | 84 +++++++++---------- eng/pipelines/runtimelab.yml | 18 ++-- eng/targetframeworksuffix.props | 2 +- eng/testing/tests.targets | 22 ++--- src/coreclr/build-runtime.cmd | 4 +- src/coreclr/crossgen-corelib.cmd | 4 +- src/coreclr/dir.common.props | 2 +- src/coreclr/scripts/coreclr_arguments.py | 6 +- src/coreclr/scripts/jitrollingbuild.py | 8 +- src/coreclr/scripts/superpmi-setup.py | 2 +- src/coreclr/scripts/superpmi.md | 2 +- src/coreclr/scripts/superpmi.proj | 8 +- src/coreclr/scripts/superpmi.py | 38 ++++----- src/coreclr/src/.nuget/Directory.Build.props | 6 +- .../Microsoft.NETCore.ILAsm.pkgproj | 2 +- .../Microsoft.NETCore.ILDAsm.pkgproj | 2 +- .../Microsoft.NETCore.TestHost.pkgproj | 2 +- src/coreclr/src/.nuget/optdata/optdata.csproj | 3 +- .../System.Private.CoreLib.csproj | 3 - src/coreclr/src/ToolBox/superpmi/readme.md | 16 ++-- src/coreclr/src/inc/readme.md | 4 +- .../src/tools/aot/crossgen2/crossgen2.csproj | 10 +-- .../src/vm/.vscode/c_cpp_properties.json | 6 +- src/installer/Directory.Build.props | 22 ++--- .../cli/apphost/static/CMakeLists.txt | 2 +- src/installer/corehost/corehost.proj | 6 +- src/installer/pkg/packaging/installers.proj | 24 +++--- .../Microsoft.NETCore.DotNetAppHost.props | 2 +- .../projects/netcoreapp/Directory.Build.props | 2 +- .../Microsoft.NETCore.App.Crossgen2.pkgproj | 2 +- src/installer/signing/Directory.Build.targets | 2 +- .../HostActivation.Tests.csproj | 2 +- .../Security/Cryptography/Asn1/AsnXml.targets | 4 +- .../Common/tests/Common.Tests.csproj | 2 +- .../tests/StaticTestGenerator/Program.cs | 2 +- .../tests/StaticTestGenerator/README.md | 10 +-- src/libraries/Directory.Build.props | 14 ++-- .../src/Microsoft.CSharp.csproj | 2 +- ...gnostics.Tracing.EventSource.Redist.csproj | 2 +- ...cs.Tracing.EventSource.Redist.Tests.csproj | 2 +- ...osoft.Extensions.Hosting.Unit.Tests.csproj | 2 +- .../Microsoft.Extensions.Logging.Tests.csproj | 2 +- .../src/Microsoft.VisualBasic.Core.vbproj | 2 +- .../src/Microsoft.Win32.Primitives.csproj | 2 +- .../Microsoft.Win32.Primitives.Tests.csproj | 2 +- ...rosoft.Win32.Registry.AccessControl.csproj | 2 +- ....Win32.Registry.AccessControl.Tests.csproj | 2 +- .../src/Microsoft.Win32.Registry.csproj | 2 +- .../Microsoft.Win32.Registry.Tests.csproj | 2 +- .../src/Microsoft.Win32.SystemEvents.csproj | 2 +- .../Microsoft.Win32.SystemEvents.Tests.csproj | 2 +- ...osoft.XmlSerializer.Generator.Tests.csproj | 4 +- src/libraries/Native/build-native.cmd | 2 +- src/libraries/Native/build-native.proj | 4 +- ...guration.ConfigurationManager.Tests.csproj | 2 +- .../System.Console/src/System.Console.csproj | 2 +- .../tests/System.Console.Tests.csproj | 2 +- .../src/System.Data.Odbc.csproj | 2 +- .../tests/System.Data.Odbc.Tests.csproj | 2 +- .../src/System.Data.OleDb.csproj | 2 +- .../tests/System.Data.OleDb.Tests.csproj | 2 +- .../System.Diagnostics.Debug.Tests.csproj | 2 +- ....Diagnostics.DiagnosticSource.Tests.csproj | 2 +- .../src/System.Diagnostics.EventLog.csproj | 2 +- .../System.Diagnostics.EventLog.Tests.csproj | 2 +- .../System.Diagnostics.FileVersionInfo.csproj | 2 +- ...m.Diagnostics.FileVersionInfo.Tests.csproj | 2 +- ...stem.Diagnostics.PerformanceCounter.csproj | 2 +- ...iagnostics.PerformanceCounter.Tests.csproj | 2 +- .../src/System.Diagnostics.Process.csproj | 2 +- .../System.Diagnostics.Process.Tests.csproj | 2 +- .../System.Diagnostics.Tracing.Tests.csproj | 2 +- ...DirectoryServices.AccountManagement.csproj | 2 +- ...oryServices.AccountManagement.Tests.csproj | 2 +- .../System.DirectoryServices.Protocols.csproj | 2 +- ...m.DirectoryServices.Protocols.Tests.csproj | 2 +- .../src/System.DirectoryServices.csproj | 2 +- .../System.DirectoryServices.Tests.csproj | 2 +- .../src/System.Drawing.Common.csproj | 2 +- .../tests/System.Drawing.Common.Tests.csproj | 2 +- .../src/System.Drawing.Primitives.csproj | 2 +- ....Globalization.Extensions.Nls.Tests.csproj | 2 +- .../System.Globalization.Nls.Tests.csproj | 2 +- .../src/System.IO.Compression.Brotli.csproj | 2 +- .../System.IO.Compression.Brotli.Tests.csproj | 2 +- .../src/System.IO.Compression.csproj | 2 +- .../tests/System.IO.Compression.Tests.csproj | 2 +- .../System.IO.FileSystem.AccessControl.csproj | 2 +- ...m.IO.FileSystem.AccessControl.Tests.csproj | 2 +- .../src/System.IO.FileSystem.DriveInfo.csproj | 2 +- ...ystem.IO.FileSystem.DriveInfo.Tests.csproj | 2 +- .../src/System.IO.FileSystem.Watcher.csproj | 2 +- .../System.IO.FileSystem.Watcher.Tests.csproj | 2 +- .../src/System.IO.FileSystem.csproj | 2 +- .../tests/System.IO.FileSystem.Tests.csproj | 2 +- .../src/System.IO.IsolatedStorage.csproj | 2 +- .../System.IO.IsolatedStorage.Tests.csproj | 2 +- .../src/System.IO.MemoryMappedFiles.csproj | 2 +- .../System.IO.MemoryMappedFiles.Tests.csproj | 2 +- .../tests/System.IO.Packaging.Tests.csproj | 2 +- .../src/System.IO.Pipes.AccessControl.csproj | 2 +- ...System.IO.Pipes.AccessControl.Tests.csproj | 2 +- .../src/System.IO.Pipes.csproj | 2 +- .../tests/System.IO.Pipes.Tests.csproj | 2 +- .../src/System.IO.Ports.csproj | 2 +- .../tests/System.IO.Ports.Tests.csproj | 2 +- .../src/System.Management.csproj | 2 +- .../tests/System.Management.Tests.csproj | 2 +- .../src/System.Net.Http.WinHttpHandler.csproj | 2 +- ...ttp.WinHttpHandler.Functional.Tests.csproj | 2 +- ....Net.Http.WinHttpHandler.Unit.Tests.csproj | 2 +- .../src/System.Net.Http.csproj | 2 +- .../System.Net.Http.Functional.Tests.csproj | 2 +- .../HttpStress/load-corefx-testhost.ps1 | 4 +- .../System.Net.Http.Unit.Tests.csproj | 2 +- .../src/System.Net.HttpListener.csproj | 2 +- .../System.Net.HttpListener.Tests.csproj | 2 +- .../src/System.Net.Mail.csproj | 2 +- .../Unit/System.Net.Mail.Unit.Tests.csproj | 2 +- .../src/System.Net.NameResolution.csproj | 2 +- ...Net.NameResolution.Functional.Tests.csproj | 2 +- ...System.Net.NameResolution.Pal.Tests.csproj | 2 +- ...ystem.Net.NameResolution.Unit.Tests.csproj | 2 +- .../src/System.Net.NetworkInformation.csproj | 2 +- .../src/System.Net.Ping.csproj | 2 +- .../System.Net.Ping.Functional.Tests.csproj | 2 +- .../src/System.Net.Primitives.csproj | 2 +- ...tem.Net.Primitives.Functional.Tests.csproj | 2 +- .../System.Net.Primitives.Pal.Tests.csproj | 2 +- ...stem.Net.Primitives.UnitTests.Tests.csproj | 2 +- .../src/System.Net.Quic.csproj | 2 +- .../System.Net.Quic.Functional.Tests.csproj | 2 +- .../src/System.Net.Requests.csproj | 2 +- .../src/System.Net.Security.csproj | 2 +- .../System.Net.Security.Tests.csproj | 2 +- .../System.Net.Security.Unit.Tests.csproj | 2 +- .../src/System.Net.Sockets.csproj | 2 +- .../System.Net.Sockets.Tests.csproj | 2 +- .../src/System.Private.Uri.csproj | 2 +- .../src/System.Private.Xml.csproj | 2 +- .../System.Resources.Extensions.Tests.csproj | 2 +- ...tem.Resources.ResourceManager.Tests.csproj | 2 +- .../src/System.Runtime.Caching.csproj | 2 +- .../tests/System.Runtime.Caching.Tests.csproj | 2 +- .../System.Runtime.Extensions.Tests.csproj | 2 +- ....InteropServices.RuntimeInformation.csproj | 2 +- ...opServices.RuntimeInformation.Tests.csproj | 2 +- ...ystem.Runtime.InteropServices.Tests.csproj | 2 +- ...time.Serialization.Formatters.Tests.csproj | 2 +- .../NlsTests/System.Runtime.Nls.Tests.csproj | 2 +- .../tests/System.Runtime.Tests.csproj | 2 +- .../src/System.Security.AccessControl.csproj | 2 +- ...System.Security.AccessControl.Tests.csproj | 2 +- ...em.Security.Cryptography.Algorithms.csproj | 2 +- ...urity.Cryptography.Algorithms.Tests.csproj | 2 +- .../System.Security.Cryptography.Cng.csproj | 2 +- ...tem.Security.Cryptography.Cng.Tests.csproj | 2 +- .../System.Security.Cryptography.Csp.csproj | 2 +- ...tem.Security.Cryptography.Csp.Tests.csproj | 2 +- ...stem.Security.Cryptography.Encoding.csproj | 2 +- ...ecurity.Cryptography.Encoding.Tests.csproj | 2 +- .../System.Security.Cryptography.Pkcs.csproj | 2 +- ...em.Security.Cryptography.Pkcs.Tests.csproj | 2 +- ...Security.Cryptography.ProtectedData.csproj | 2 +- ...ty.Cryptography.ProtectedData.Tests.csproj | 2 +- ...urity.Cryptography.X509Certificates.csproj | 2 +- ...Cryptography.X509Certificates.Tests.csproj | 2 +- .../System.Security.Permissions.Tests.csproj | 2 +- .../System.Security.Principal.Windows.csproj | 2 +- ...em.Security.Principal.Windows.Tests.csproj | 2 +- .../System.ServiceModel.Syndication.csproj | 2 +- ...stem.ServiceModel.Syndication.Tests.csproj | 2 +- ...em.ServiceProcess.ServiceController.csproj | 2 +- ...viceProcess.ServiceController.Tests.csproj | 2 +- .../src/System.Text.Encoding.CodePages.csproj | 2 +- ...ystem.Text.Encoding.CodePages.Tests.csproj | 2 +- .../src/System.Threading.AccessControl.csproj | 2 +- ...ystem.Threading.AccessControl.Tests.csproj | 2 +- .../src/System.Windows.Extensions.csproj | 2 +- .../System.Windows.Extensions.Tests.csproj | 2 +- src/libraries/externals.csproj | 2 +- src/libraries/illink-sharedframework.targets | 4 +- src/libraries/sendtohelix.proj | 2 +- src/libraries/sendtohelixhelp.proj | 2 +- src/mono/Directory.Build.props | 2 +- src/tests/Common/helixpublishwitharcade.proj | 2 +- src/tests/Common/scripts/arm32_ci_script.sh | 2 +- src/tests/Common/scripts/arm32_ci_test.sh | 2 +- src/tests/Common/scripts/arm64_post_build.py | 4 +- src/tests/Common/scripts/bringup_runtest.sh | 4 +- src/tests/Common/scripts/format.py | 8 +- src/tests/Common/scripts/run-corefx-tests.bat | 10 +-- .../scripts/run-gc-reliability-framework.cmd | 4 +- src/tests/Common/scripts/run-pmi-diffs.py | 4 +- .../Common/setup-stress-dependencies.cmd | 2 +- .../test_dependencies.csproj | 2 +- src/tests/Common/testgrouping.proj | 2 +- src/tests/Directory.Build.props | 2 +- src/tests/JIT/CheckProjects/CheckProjects.cs | 4 +- .../JIT/Directed/StructABI/StructABI.csproj | 2 +- .../RunBenchmarks/RunBenchmarks.cmd | 4 +- .../RunBenchmarks/RunBenchmarks.sh | 6 +- src/tests/JIT/superpmi/collect_alltests.cmd | 2 +- src/tests/JIT/superpmi/collect_alltests.sh | 2 +- src/tests/JIT/superpmi/runtests.sh | 6 +- src/tests/build.cmd | 2 +- .../JitBench/unofficial_dotnet/README.md | 2 +- .../crossboundarytests.cmd | 2 +- src/tests/readytorun/r2rdump/rebaseline.cmd | 36 ++++---- src/tests/run.cmd | 2 +- src/tests/run.proj | 4 +- src/tests/run.py | 26 +++--- src/tests/run.sh | 2 +- src/tests/runparallel.sh | 2 +- 297 files changed, 754 insertions(+), 767 deletions(-) diff --git a/docs/coding-guidelines/interop-guidelines.md b/docs/coding-guidelines/interop-guidelines.md index 7dff0711a8d3e..5ce81404073fb 100644 --- a/docs/coding-guidelines/interop-guidelines.md +++ b/docs/coding-guidelines/interop-guidelines.md @@ -120,7 +120,7 @@ internal static partial class Interop // contents of Common\src\Interop\Windows\ ``` ### Build System -When building dotnet/runtime, we use the "TargetOS" property to control what target platform we are building for. The valid values for this property are Windows_NT (which is the default value from MSBuild when running on Windows), Linux and OSX. +When building dotnet/runtime, we use the "TargetOS" property to control what target platform we are building for. The valid values for this property are windows (which is the default value from MSBuild when running on Windows), Linux and OSX. #### Project Files Whenever possible, a single .csproj should be used per assembly, spanning all target platforms, e.g. System.Console.csproj includes conditional entries for when targeting Windows vs when targeting Linux. A property can be passed to dotnet build to control which flavor is built, e.g. `dotnet build /p:TargetOS=OSX System.Console.csproj`. diff --git a/docs/coding-guidelines/project-guidelines.md b/docs/coding-guidelines/project-guidelines.md index afc05f4037b22..69ba1fd53014b 100644 --- a/docs/coding-guidelines/project-guidelines.md +++ b/docs/coding-guidelines/project-guidelines.md @@ -16,7 +16,7 @@ Below is a list of all the various options we pivot the project builds on: - **Target Frameworks:** .NETFramework, .NETStandard, .NETCoreApp - **Platform Runtimes:** .NETFramework (aka CLR/Desktop), CoreCLR, Mono -- **OS:** Windows_NT, Linux, OSX, FreeBSD, AnyOS +- **OS:** windows, Linux, OSX, FreeBSD, AnyOS - **Flavor:** Debug, Release ## Individual build properties @@ -52,7 +52,7 @@ Pure netstandard configuration: All supported targets with unique windows/unix build for netcoreapp: ``` - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461-Windows_NT + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;net461-windows ``` @@ -73,7 +73,7 @@ When building an individual project the `BuildTargetFramework` and `TargetOS` wi ## Supported full build settings - .NET Core latest on current OS (default) -> `$(NetCoreAppCurrent)-[RunningOS]` -- .NET Framework latest -> `net48-Windows_NT` +- .NET Framework latest -> `net48-windows` # Library project guidelines @@ -100,7 +100,7 @@ Example: Example: ``` - netstandard2.0-Windows_NT;netstandard2.0-Unix + netstandard2.0-windows;netstandard2.0-Unix $(Platform) $(Configuration) skiptests $(BuildArguments) -nopgooptimize - $(BuildArguments) msbuildonunsupportedplatform + $(BuildArguments) msbuildonunsupportedplatform + $(BuildArguments) -clang6.0 $(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE $(BuildArguments) skipnuget cross -skiprestore cmakeargs -DFEATURE_GDBJIT=TRUE diff --git a/docs/workflow/debugging/coreclr/debugging.md b/docs/workflow/debugging/coreclr/debugging.md index 580032545d298..d8db911b2dc47 100644 --- a/docs/workflow/debugging/coreclr/debugging.md +++ b/docs/workflow/debugging/coreclr/debugging.md @@ -9,17 +9,17 @@ Debugging CoreCLR on Windows ============================ 1. Perform a build of the repo. -2. Open solution \\artifacts\obj\coreclr\Windows_NT.\.\\CoreCLR.sln in Visual Studio. \ and \ are based +2. Open solution \\artifacts\obj\coreclr\windows.\.\\CoreCLR.sln in Visual Studio. \ and \ are based on type of build you did. By default they are 'x64' and 'Debug'. 3. Right-click the INSTALL project and choose ‘Set as StartUp Project’ 4. Bring up the properties page for the INSTALL project 5. Select Configuration Properties->Debugging from the left side tree control -6. Set Command=`$(SolutionDir)\..\..\..\bin\coreclr\Windows_NT.$(Platform).$(Configuration)\corerun.exe` +6. Set Command=`$(SolutionDir)\..\..\..\bin\coreclr\windows.$(Platform).$(Configuration)\corerun.exe` 1. This points to the folder where the built runtime binaries are present. 7. Set Command Arguments=`` (e.g. HelloWorld.dll) -8. Set Working Directory=`$(SolutionDir)\..\..\..\bin\coreclr\Windows_NT.$(Platform).$(Configuration)` +8. Set Working Directory=`$(SolutionDir)\..\..\..\bin\coreclr\windows.$(Platform).$(Configuration)` 1. This points to the folder containing CoreCLR binaries. -9. Set Environment=`CORE_LIBRARIES=$(SolutionDir)\..\..\..\bin\runtime\-Windows_NT-$(Configuration)-$(Platform)`, +9. Set Environment=`CORE_LIBRARIES=$(SolutionDir)\..\..\..\bin\runtime\-windows-$(Configuration)-$(Platform)`, where '\' is the target framework of current branch, for example `netcoreapp3.1` `net5.0`. 1. This points to the folder containing core libraries except `System.Private.CoreLib`. 2. This step can be skipped if you are debugging CLR tests that references only `System.Private.CoreLib`. diff --git a/docs/workflow/debugging/libraries/debugging-packages.md b/docs/workflow/debugging/libraries/debugging-packages.md index f72887149b7f4..7a57a2219ceac 100644 --- a/docs/workflow/debugging/libraries/debugging-packages.md +++ b/docs/workflow/debugging/libraries/debugging-packages.md @@ -101,5 +101,5 @@ dotnet build System.Net.ServicePoint.Tests.csproj -f netcoreapp2.0 /t:test /p:Ou Will run the test using the following pivot values: * Architecture: AnyCPU * Flavor: Debug -* OS: Windows_NT +* OS: windows * Target: netstandard2.0 diff --git a/docs/workflow/debugging/libraries/windows-instructions.md b/docs/workflow/debugging/libraries/windows-instructions.md index 46d916e74da89..5a1bedd45d912 100644 --- a/docs/workflow/debugging/libraries/windows-instructions.md +++ b/docs/workflow/debugging/libraries/windows-instructions.md @@ -33,15 +33,15 @@ To run a single test from command line: * Locate the test binary folder based on the CSPROJ name. -For example: `src\System.Net.Sockets\tests\Functional\System.Net.Sockets.Tests.csproj` will build and output binaries at `bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0`. +For example: `src\System.Net.Sockets\tests\Functional\System.Net.Sockets.Tests.csproj` will build and output binaries at `bin\tests\windows.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0`. * Execute the test Assuming that your repo is at `C:\corefx`: ``` -cd C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0 -C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0\CoreRun.exe xunit.console.dll System.Net.Sockets.Tests.dll -xml testResults.xml -notrait category=nonwindowstests -notrait category=OuterLoop -notrait category=failing +cd C:\corefx\bin\tests\windows.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0 +C:\corefx\bin\tests\windows.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0\CoreRun.exe xunit.console.dll System.Net.Sockets.Tests.dll -xml testResults.xml -notrait category=nonwindowstests -notrait category=OuterLoop -notrait category=failing ``` * If the test crashes or encounters a `Debugger.Launch()` method call, WinDBG will automatically start and attach to the `CoreRun.exe` process diff --git a/docs/workflow/editing-and-debugging.md b/docs/workflow/editing-and-debugging.md index 5143ca82b2402..8297b10d28734 100644 --- a/docs/workflow/editing-and-debugging.md +++ b/docs/workflow/editing-and-debugging.md @@ -20,7 +20,7 @@ what are in the repository. In particular * `src\coreclr\src\System.Private.CoreLib\System.Private.CorLib.sln` - This solution is for all managed (C#) code that is defined in the runtime itself. This is all class library support of one form or another. - * `artifacts\obj\coreclr\Windows_NT..\CoreCLR.sln` - this solution contains most native (C++) projects + * `artifacts\obj\coreclr\windows..\CoreCLR.sln` - this solution contains most native (C++) projects associated with the repository, including * `coreclr` - This is the main runtime DLL (the GC, class loader, interop are all here) * `corjit` - This is the Just In Time (JIT) compiler that compiles .NET Intermediate language to native code. diff --git a/docs/workflow/testing/coreclr/running-aspnet-benchmarks-with-crossgen2.md b/docs/workflow/testing/coreclr/running-aspnet-benchmarks-with-crossgen2.md index b68e3cebc0803..5e8dd20ac8afa 100644 --- a/docs/workflow/testing/coreclr/running-aspnet-benchmarks-with-crossgen2.md +++ b/docs/workflow/testing/coreclr/running-aspnet-benchmarks-with-crossgen2.md @@ -185,7 +185,7 @@ using the following command. On Windows: ```powershell -CoreRun.exe \runtime\artifacts\bin\coreclr\Windows_NT.x64.Release\crossgen2\crossgen2.dll +CoreRun.exe \runtime\artifacts\bin\coreclr\windows.x64.Release\crossgen2\crossgen2.dll --Os --composite -o \path\to\results\composite\TotalComposite.dll \path\to\results\application\*.dll ``` diff --git a/docs/workflow/testing/coreclr/windows-test-instructions.md b/docs/workflow/testing/coreclr/windows-test-instructions.md index c581c3529e965..540c0794fa89a 100644 --- a/docs/workflow/testing/coreclr/windows-test-instructions.md +++ b/docs/workflow/testing/coreclr/windows-test-instructions.md @@ -61,13 +61,13 @@ In order to run all of the tests using your checked build: > src\tests\run.cmd checked ``` -This will generate a report named `TestRun__.html` (e.g. `TestRun_Windows_NT_x64_Checked.html`) in the subdirectory `\artifacts\log`. Any tests that failed will be listed in `TestRunResults_Windows_NT_x64_Checked.err`. +This will generate a report named `TestRun__.html` (e.g. `TestRun_windows_x64_Checked.html`) in the subdirectory `\artifacts\log`. Any tests that failed will be listed in `TestRunResults_windows_x64_Checked.err`. ### Investigating Test Failures Upon completing a test run, you may find one or more tests have failed. -The output of the test will be available in `Test` reports directory, but by default the directory will be something like `\artifacts\tests\coreclr\Windows_NT.x64.Checked\Reports\Exceptions\Finalization`. +The output of the test will be available in `Test` reports directory, but by default the directory will be something like `\artifacts\tests\coreclr\windows.x64.Checked\Reports\Exceptions\Finalization`. There are 2 files of interest: @@ -79,16 +79,16 @@ There are 2 files of interest: If you wish to re-run a failed test, follow the following steps: 1) Set an environment variable, `CORE_ROOT`, pointing to the path to product binaries that was passed to run.cmd. -For example using a checked build the location would be: `\artifacts\tests\coreclr\Windows_NT.x64.Checked\Tests\Core_Root` +For example using a checked build the location would be: `\artifacts\tests\coreclr\windows.x64.Checked\Tests\Core_Root` -2) Run the failed test, the command to which is also present in the test report for a failed test. It will be something like `\artifacts\tests\coreclr\Windows_NT.x64.Checked\Exceptions\Finalization\Finalizer.cmd`. +2) Run the failed test, the command to which is also present in the test report for a failed test. It will be something like `\artifacts\tests\coreclr\windows.x64.Checked\Exceptions\Finalization\Finalizer.cmd`. If you wish to run the test under a debugger (e.g. [WinDbg](http://msdn.microsoft.com/library/windows/hardware/ff551063(v=vs.85).aspx)), append `-debug ` to the test command. For example: ``` -> artifacts\tests\coreclr\Windows_NT.x64.Checked\Exceptions\Finalization\Finalizer.cmd -debug +> artifacts\tests\coreclr\windows.x64.Checked\Exceptions\Finalization\Finalizer.cmd -debug ``` ### Modifying a test -If test changes are needed, make the change, and build the test project. This will binplace the binaries in the test binaries folder (e.g. `\artifacts\tests\coreclr\Windows_NT.x64.Checked\Exceptions\Finalization`). Then re-run the test following the instructions above. +If test changes are needed, make the change, and build the test project. This will binplace the binaries in the test binaries folder (e.g. `\artifacts\tests\coreclr\windows.x64.Checked\Exceptions\Finalization`). Then re-run the test following the instructions above. diff --git a/docs/workflow/testing/libraries/filtering-tests.md b/docs/workflow/testing/libraries/filtering-tests.md index 2b1b3d9867b41..7f9b9ec8c7cd8 100644 --- a/docs/workflow/testing/libraries/filtering-tests.md +++ b/docs/workflow/testing/libraries/filtering-tests.md @@ -148,7 +148,7 @@ _**A few common examples with the above attributes:**_ - Run all tests acceptable on Windows that are not failing: ```cmd -dotnet build /t:Test /p:TargetOS=Windows_NT +dotnet build /t:Test /p:TargetOS=windows ``` - Run all outer loop tests acceptable on OS X that are currently associated with active issues: ```sh diff --git a/docs/workflow/testing/using-corerun.md b/docs/workflow/testing/using-corerun.md index 01a2aedffa1b0..33e4d1fdb3a35 100644 --- a/docs/workflow/testing/using-corerun.md +++ b/docs/workflow/testing/using-corerun.md @@ -31,7 +31,7 @@ Consider that you already have a .NET application DLL called HelloWorld.dll and If you execute the following ```bat - set PATH=%PATH%;%CoreCLR%\artifacts\tests\coreclr\Windows_NT.x64.Debug\Tests\Core_Root\ + set PATH=%PATH%;%CoreCLR%\artifacts\tests\coreclr\windows.x64.Debug\Tests\Core_Root\ set CORE_LIBRARIES=%ProgramFiles%\dotnet\shared\Microsoft.NETCore.App\1.0.0 @@ -73,11 +73,11 @@ variable CORE_ROOT to this directory (running src\tests\build from the repository base) and running 'src\tests\run') you can do the following ```bat - set PATH=%PATH%;%CoreCLR%\artifacts\Product\Windows_NT.x64.Debug - set CORE_ROOT=%CoreCLR%\artifacts\tests\coreclr\Windows_NT.x64.Debug\Tests\Core_Root + set PATH=%PATH%;%CoreCLR%\artifacts\Product\windows.x64.Debug + set CORE_ROOT=%CoreCLR%\artifacts\tests\coreclr\windows.x64.Debug\Tests\Core_Root ``` sets you up so that corerun can run any of the test. For example ```bat - corerun artifacts\tests\coreclr\Windows_NT.X64.Debug\GC\Features\Finalizer\finalizeio\finalizeio\finalizeio.exe + corerun artifacts\tests\coreclr\windows.X64.Debug\GC\Features\Finalizer\finalizeio\finalizeio\finalizeio.exe ``` runs the finalizerio test. diff --git a/docs/workflow/using-dotnet-cli.md b/docs/workflow/using-dotnet-cli.md index 8090f0eddc2c6..ce410d7382919 100644 --- a/docs/workflow/using-dotnet-cli.md +++ b/docs/workflow/using-dotnet-cli.md @@ -179,7 +179,7 @@ which should make things work (but is fragile, confirm file timestamps that you Get this by simply listing the name of the `runtime.win-x64.Microsoft.NETCore.Runtime.CoreCLR` you built. ```bat - dir artifacts\bin\coreclr\Product\Windows_NT.x64.Release\.nuget\pkg + dir artifacts\bin\coreclr\Product\windows.x64.Release\.nuget\pkg ``` and you will get name of the which looks something like this diff --git a/eng/Configurations.props b/eng/Configurations.props index 352e32f6cab0d..d26beec0e3e68 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -58,7 +58,7 @@ illumos Solaris Linux - Windows_NT + windows $(TargetOS) $(TargetOS) $(TargetOS) diff --git a/eng/Subsets.props b/eng/Subsets.props index e2c4d1602f5be..43843ea213934 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -149,7 +149,7 @@ - + diff --git a/eng/build.ps1 b/eng/build.ps1 index df1750a87103a..4faea7ff30c3d 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -6,7 +6,7 @@ Param( [string][Alias('f')]$framework, [string]$vs, [string][Alias('v')]$verbosity = "minimal", - [ValidateSet("Windows_NT","Linux","OSX","Browser")][string]$os, + [ValidateSet("windows","Linux","OSX","Browser")][string]$os, [switch]$allconfigurations, [switch]$coverage, [string]$testscope, @@ -34,7 +34,7 @@ function Get-Help() { Write-Host " -help (-h) Print help and exit." Write-Host " -librariesConfiguration (-lc) Libraries build configuration: Debug or Release." Write-Host " [Default: Debug]" - Write-Host " -os Target operating system: Windows_NT, Linux, OSX, or Browser." + Write-Host " -os Target operating system: windows, Linux, OSX, or Browser." Write-Host " [Default: Your machine's OS.]" Write-Host " -runtimeConfiguration (-rc) Runtime build configuration: Debug, Release or Checked." Write-Host " Checked is exclusive to the CLR runtime. It is the same as Debug, except code is" @@ -129,7 +129,7 @@ if ($vs) { if ($runtimeConfiguration) { $configToOpen = $runtimeConfiguration } - $vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "artifacts\obj\coreclr" | Join-Path -ChildPath "Windows_NT.$archToOpen.$((Get-Culture).TextInfo.ToTitleCase($configToOpen))" | Join-Path -ChildPath "CoreCLR.sln" + $vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "artifacts\obj\coreclr" | Join-Path -ChildPath "windows.$archToOpen.$((Get-Culture).TextInfo.ToTitleCase($configToOpen))" | Join-Path -ChildPath "CoreCLR.sln" if (-Not (Test-Path $vs)) { $repoRoot = Split-Path $PSScriptRoot -Parent Invoke-Expression "& `"$repoRoot/src/coreclr/build-runtime.cmd`" -configureonly -$archToOpen -$configToOpen" diff --git a/eng/build.sh b/eng/build.sh index 5904565f9143f..e3d495687c95b 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -28,7 +28,7 @@ usage() echo " --help (-h) Print help and exit." echo " --librariesConfiguration (-lc) Libraries build configuration: Debug or Release." echo " [Default: Debug]" - echo " --os Target operating system: Windows_NT, Linux, FreeBSD, OSX, tvOS, iOS, Android," + echo " --os Target operating system: windows, Linux, FreeBSD, OSX, tvOS, iOS, Android," echo " Browser, NetBSD, illumos or Solaris." echo " [Default: Your machine's OS.]" echo " --projects Project or solution file(s) to build." @@ -254,8 +254,8 @@ while [[ $# > 0 ]]; do fi passedOS="$(echo "$2" | awk '{print tolower($0)}')" case "$passedOS" in - windows_nt) - os="Windows_NT" ;; + windows) + os="windows" ;; linux) os="Linux" ;; freebsd) @@ -276,7 +276,7 @@ while [[ $# > 0 ]]; do os="Solaris" ;; *) echo "Unsupported target OS '$2'." - echo "The allowed values are Windows_NT, Linux, FreeBSD, OSX, tvOS, iOS, Android, Browser, illumos and Solaris." + echo "The allowed values are windows, Linux, FreeBSD, OSX, tvOS, iOS, Android, Browser, illumos and Solaris." exit 1 ;; esac diff --git a/eng/codeOptimization.targets b/eng/codeOptimization.targets index 6ed7e997487bd..f0766c2c6e3a1 100644 --- a/eng/codeOptimization.targets +++ b/eng/codeOptimization.targets @@ -17,7 +17,7 @@ BeforeTargets="CoreCompile"> $(IbcOptimizationDataDir)Linux\ - $(IbcOptimizationDataDir)Windows\ + $(IbcOptimizationDataDir)Windows\ <_optimizationDataAssembly Include="$(IbcOptimizationDataDir)**\$(TargetFileName)" /> diff --git a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile index 584c1e838e668..dd306fc4ff126 100644 --- a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile @@ -5,7 +5,7 @@ FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=".\\artifacts\\bin\\testhost" ARG TFM=net6.0 -ARG OS=Windows_NT +ARG OS=windows ARG ARCH=x64 ARG CONFIGURATION=Release diff --git a/eng/docker/libraries-sdk.windows.Dockerfile b/eng/docker/libraries-sdk.windows.Dockerfile index adbf17302fefa..564378f446729 100644 --- a/eng/docker/libraries-sdk.windows.Dockerfile +++ b/eng/docker/libraries-sdk.windows.Dockerfile @@ -5,7 +5,7 @@ FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=".\\artifacts\\bin\\testhost" ARG TFM=net6.0 -ARG OS=Windows_NT +ARG OS=windows ARG ARCH=x64 ARG CONFIGURATION=Release diff --git a/eng/illink.targets b/eng/illink.targets index e5814573953d9..d8aea8234e3d7 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -89,7 +89,7 @@ Include="$(ILLinkSuppressionsConfigurationSpecificXmlFile)" /> - diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 5135de0725444..f561eb7a9bbf4 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -27,7 +27,7 @@ '$(AllArtifactsDownloadPath)' != ''"> $(RuntimeIdentifier) - $(ArtifactPlatform.Replace('win-', 'Windows_NT-')) + $(ArtifactPlatform.Replace('win-', 'windows-')) $(ArtifactPlatform.Replace('unix-', 'Unix-')) $(ArtifactPlatform.Replace('linux-', 'Linux-')) $(ArtifactPlatform.Replace('osx-', 'OSX-')) diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake index 0d4ee0dae6def..f8b1a10c0e8ff 100644 --- a/eng/native/configureplatform.cmake +++ b/eng/native/configureplatform.cmake @@ -178,7 +178,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL SunOS) endif(CLR_CMAKE_HOST_OS STREQUAL SunOS) if(CLR_CMAKE_HOST_OS STREQUAL Windows) - set(CLR_CMAKE_HOST_OS Windows_NT) + set(CLR_CMAKE_HOST_OS windows) set(CLR_CMAKE_HOST_WIN32 1) endif(CLR_CMAKE_HOST_OS STREQUAL Windows) @@ -369,7 +369,7 @@ if (CLR_CMAKE_TARGET_OS STREQUAL CLR_CMAKE_HOST_OS) endif() endif() else() - if(NOT (CLR_CMAKE_HOST_OS STREQUAL Windows_NT)) + if(NOT (CLR_CMAKE_HOST_OS STREQUAL windows)) message(FATAL_ERROR "Invalid host and target os/arch combination. Host OS: ${CLR_CMAKE_HOST_OS}") endif() if(NOT (CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_ALPINE_LINUX)) diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake index e8f4a6f241863..10c17e692641c 100644 --- a/eng/native/functions.cmake +++ b/eng/native/functions.cmake @@ -187,7 +187,7 @@ function(compile_asm) foreach(ASM_FILE ${COMPILE_ASM_ASM_FILES}) get_filename_component(name ${ASM_FILE} NAME_WE) # Produce object file where CMake would store .obj files for an OBJECT library. - # ex: artifacts\obj\coreclr\Windows_NT.arm64.Debug\src\vm\wks\cee_wks.dir\Debug\AsmHelpers.obj + # ex: artifacts\obj\coreclr\windows.arm64.Debug\src\vm\wks\cee_wks.dir\Debug\AsmHelpers.obj set (OBJ_FILE "${CMAKE_CURRENT_BINARY_DIR}/${COMPILE_ASM_TARGET}.dir/${CMAKE_CFG_INTDIR}/${name}.obj") # Need to compile asm file using custom command as include directories are not provided to asm compiler diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 1424259657b88..109caf7cb228c 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -495,16 +495,16 @@ jobs: # Windows x64 -- ${{ if or(containsValue(parameters.platforms, 'Windows_NT_x64'), in(parameters.platformGroup, 'all', 'gcstress')) }}: +- ${{ if or(containsValue(parameters.platforms, 'windows_x64'), in(parameters.platformGroup, 'all', 'gcstress')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Windows_NT + osGroup: windows archType: x64 targetRid: win-x64 - platform: Windows_NT_x64 + platform: windows_x64 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} stagedBuild: ${{ parameters.stagedBuild }} @@ -516,16 +516,16 @@ jobs: # Windows x86 -- ${{ if or(containsValue(parameters.platforms, 'Windows_NT_x86'), in(parameters.platformGroup, 'all', 'gcstress')) }}: +- ${{ if or(containsValue(parameters.platforms, 'windows_x86'), in(parameters.platformGroup, 'all', 'gcstress')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Windows_NT + osGroup: windows archType: x86 targetRid: win-x86 - platform: Windows_NT_x86 + platform: windows_x86 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} stagedBuild: ${{ parameters.stagedBuild }} @@ -536,16 +536,16 @@ jobs: ${{ insert }}: ${{ parameters.jobParameters }} # Windows arm -- ${{ if or(containsValue(parameters.platforms, 'Windows_NT_arm'), eq(parameters.platformGroup, 'all')) }}: +- ${{ if or(containsValue(parameters.platforms, 'windows_arm'), eq(parameters.platformGroup, 'all')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Windows_NT + osGroup: windows archType: arm targetRid: win-arm - platform: Windows_NT_arm + platform: windows_arm jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} stagedBuild: ${{ parameters.stagedBuild }} @@ -557,16 +557,16 @@ jobs: # Windows arm64 -- ${{ if or(containsValue(parameters.platforms, 'Windows_NT_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}: +- ${{ if or(containsValue(parameters.platforms, 'windows_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Windows_NT + osGroup: windows archType: arm64 targetRid: win-arm64 - platform: Windows_NT_arm64 + platform: windows_arm64 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} stagedBuild: ${{ parameters.stagedBuild }} diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index a658bba42fa98..f28ce14ce2cc4 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -89,7 +89,7 @@ jobs: - ${{ if eq(parameters.osGroup, 'OSX') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO displayName: Install native dependencies - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: # Necessary to install correct cmake version - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml index 647778511370b..1427e68a273e7 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml @@ -7,7 +7,7 @@ parameters: environment: {} steps: -- ${{ if eq(parameters.osGroup, 'Windows_NT') }}: +- ${{ if eq(parameters.osGroup, 'windows') }}: # TODO: Remove and consolidate this when we move to arcade via init-tools.cmd. - powershell: $(Build.SourcesDirectory)\eng\common\build.ps1 -ci ${{ parameters.restoreParams }} displayName: Restore blob feed tasks (Windows) @@ -18,7 +18,7 @@ steps: condition: ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }} env: ${{ parameters.environment }} -- ${{ if ne(parameters.osGroup, 'Windows_NT') }}: +- ${{ if ne(parameters.osGroup, 'windows') }}: # TODO: Remove and consolidate this when we move to arcade via init-tools.sh. - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci ${{ parameters.restoreParams }} displayName: Restore blob feed tasks (Unix) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index c449f3f14e641..d8df89ed73ac7 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -43,7 +43,7 @@ jobs: - name: _BuildConfig value: $(buildConfigUpper) - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - name: archiveExtension value: '.zip' - name: archiveType @@ -59,7 +59,7 @@ jobs: - name: setScriptToEchoAndFailOnNonZero value: '' - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - name: archiveExtension value: '.tar.gz' - name: archiveType @@ -119,12 +119,12 @@ jobs: vmImage: 'macOS-10.15' # Official Build Windows Pool - ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: + ${{ if and(eq(parameters.osGroup, 'windows'), ne(variables['System.TeamProject'], 'public')) }}: name: NetCoreInternal-Pool queue: BuildPool.Windows.10.Amd64.VS2019 # Public Windows Build Pool - ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}: + ${{ if and(eq(parameters.osGroup, 'windows'), eq(variables['System.TeamProject'], 'public')) }}: name: NetCorePublic-Pool queue: BuildPool.Windows.10.Amd64.VS2019.Open diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index 2c0cba802d919..ea79101e9b43d 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -46,8 +46,8 @@ jobs: - Linux_x64 - OSX_arm64 - OSX_x64 - - Windows_NT_arm - - Windows_NT_arm64 + - windows_arm + - windows_arm64 jobParameters: testGroup: outerloop @@ -75,7 +75,7 @@ jobs: - Linux_x64 - OSX_arm64 - OSX_x64 - - Windows_NT_x86 + - windows_x86 jobParameters: testGroup: outerloop @@ -131,10 +131,10 @@ jobs: - Linux_musl_arm64 - Linux_x64 - OSX_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm + - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -166,4 +166,4 @@ jobs: platforms: - Linux_x64 # Issue: https://github.com/dotnet/runtime/issues/40034 - #- Windows_NT_x64 + #- windows_x64 diff --git a/eng/pipelines/coreclr/clrinterpreter.yml b/eng/pipelines/coreclr/clrinterpreter.yml index 9506af301012f..05d2418e8449b 100644 --- a/eng/pipelines/coreclr/clrinterpreter.yml +++ b/eng/pipelines/coreclr/clrinterpreter.yml @@ -24,9 +24,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: clrinterpreter @@ -49,9 +49,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/crossgen2-composite.yml b/eng/pipelines/coreclr/crossgen2-composite.yml index 49dd16efcf62b..7e60b582eade7 100644 --- a/eng/pipelines/coreclr/crossgen2-composite.yml +++ b/eng/pipelines/coreclr/crossgen2-composite.yml @@ -23,9 +23,9 @@ jobs: - Linux_x64 - Linux_arm64 - OSX_x64 - - Windows_NT_x86 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x86 + - windows_x64 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop @@ -50,9 +50,9 @@ jobs: - Linux_x64 - Linux_arm64 - OSX_x64 - - Windows_NT_x86 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x86 + - windows_x64 + - windows_arm64 jobParameters: testGroup: innerloop readyToRun: true diff --git a/eng/pipelines/coreclr/crossgen2-gcstress.yml b/eng/pipelines/coreclr/crossgen2-gcstress.yml index f1b4fd23bf890..b0eccd168ca63 100644 --- a/eng/pipelines/coreclr/crossgen2-gcstress.yml +++ b/eng/pipelines/coreclr/crossgen2-gcstress.yml @@ -22,8 +22,8 @@ jobs: - Linux_x64 - Linux_arm64 - OSX_x64 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x64 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: gcstress-extra @@ -47,8 +47,8 @@ jobs: - Linux_x64 - Linux_arm64 - OSX_x64 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x64 + - windows_arm64 jobParameters: testGroup: gcstress-extra readyToRun: true diff --git a/eng/pipelines/coreclr/crossgen2-outerloop.yml b/eng/pipelines/coreclr/crossgen2-outerloop.yml index e5b55caca9975..e7f7d12b4bafa 100644 --- a/eng/pipelines/coreclr/crossgen2-outerloop.yml +++ b/eng/pipelines/coreclr/crossgen2-outerloop.yml @@ -22,8 +22,8 @@ jobs: - Linux_x64 - Linux_arm64 - OSX_x64 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x64 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop @@ -36,8 +36,8 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x86 - - Windows_NT_x64 + - windows_x86 + - windows_x64 jobParameters: testGroup: outerloop @@ -50,9 +50,9 @@ jobs: - Linux_arm64 - Linux_x64 - OSX_x64 - - Windows_NT_x86 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x86 + - windows_x64 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: isOfficialBuild: false @@ -78,8 +78,8 @@ jobs: - Linux_x64 - Linux_arm64 - OSX_x64 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x64 + - windows_arm64 jobParameters: testGroup: outerloop readyToRun: true @@ -114,8 +114,8 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x86 - - Windows_NT_x64 + - windows_x86 + - windows_x64 jobParameters: testGroup: outerloop liveLibrariesBuildConfig: Release @@ -129,13 +129,13 @@ jobs: buildConfig: Release platforms: - Linux_x64 - - Windows_NT_x86 + - windows_x86 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: testGroup: outerloop liveLibrariesBuildConfig: Release - targetos: Windows_NT + targetos: windows targetarch: x86 # test target Linux X64 @@ -145,7 +145,7 @@ jobs: jobTemplate: /eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml buildConfig: Release platforms: - - Windows_NT_x64 + - windows_x64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -167,7 +167,7 @@ jobs: jobParameters: testGroup: outerloop liveLibrariesBuildConfig: Release - targetos: Windows_NT + targetos: windows targetarch: x64 # test target Linux arm diff --git a/eng/pipelines/coreclr/crossgen2.yml b/eng/pipelines/coreclr/crossgen2.yml index e2623babf1e3b..01c84fa43b41d 100644 --- a/eng/pipelines/coreclr/crossgen2.yml +++ b/eng/pipelines/coreclr/crossgen2.yml @@ -22,8 +22,8 @@ jobs: - Linux_x64 - Linux_arm64 - OSX_x64 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x64 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: innerloop @@ -47,8 +47,8 @@ jobs: - Linux_x64 - Linux_arm64 - OSX_x64 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x64 + - windows_arm64 jobParameters: testGroup: innerloop readyToRun: true diff --git a/eng/pipelines/coreclr/gc-longrunning.yml b/eng/pipelines/coreclr/gc-longrunning.yml index c2dc2e07dfd11..a45dcdc868f12 100644 --- a/eng/pipelines/coreclr/gc-longrunning.yml +++ b/eng/pipelines/coreclr/gc-longrunning.yml @@ -23,8 +23,8 @@ jobs: platforms: - Linux_x64 - Linux_arm64 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x64 + - windows_arm64 - OSX_x64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: @@ -47,8 +47,8 @@ jobs: platforms: - Linux_x64 - Linux_arm64 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x64 + - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/gc-simulator.yml b/eng/pipelines/coreclr/gc-simulator.yml index bb8daf8172727..c2250084b67f1 100644 --- a/eng/pipelines/coreclr/gc-simulator.yml +++ b/eng/pipelines/coreclr/gc-simulator.yml @@ -24,8 +24,8 @@ jobs: # disable Linux x64 for now untill OOMs are resolved. # - Linux_x64 - Linux_arm64 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x64 + - windows_arm64 - OSX_x64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: @@ -49,8 +49,8 @@ jobs: # disable Linux x64 for now untill OOMs are resolved. # - Linux_x64 - Linux_arm64 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x64 + - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/ilasm.yml b/eng/pipelines/coreclr/ilasm.yml index 130f36938e47f..ebf13e9011954 100644 --- a/eng/pipelines/coreclr/ilasm.yml +++ b/eng/pipelines/coreclr/ilasm.yml @@ -33,9 +33,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: ilasm @@ -60,9 +60,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/jit-experimental.yml b/eng/pipelines/coreclr/jit-experimental.yml index 70790dddb9e29..f4bd8a36dce2a 100644 --- a/eng/pipelines/coreclr/jit-experimental.yml +++ b/eng/pipelines/coreclr/jit-experimental.yml @@ -20,7 +20,7 @@ jobs: buildConfig: checked platforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jit-experimental @@ -41,7 +41,7 @@ jobs: buildConfig: checked platforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/jitrollingbuild.yml b/eng/pipelines/coreclr/jitrollingbuild.yml index 68be50e4e2a9a..9d608216059f9 100644 --- a/eng/pipelines/coreclr/jitrollingbuild.yml +++ b/eng/pipelines/coreclr/jitrollingbuild.yml @@ -27,6 +27,6 @@ jobs: # - Linux_arm # - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 diff --git a/eng/pipelines/coreclr/jitstress-isas-arm.yml b/eng/pipelines/coreclr/jitstress-isas-arm.yml index 6a9c1b00425ce..f7fda9231f180 100644 --- a/eng/pipelines/coreclr/jitstress-isas-arm.yml +++ b/eng/pipelines/coreclr/jitstress-isas-arm.yml @@ -22,7 +22,7 @@ jobs: buildConfig: checked platforms: - Linux_arm64 - - Windows_NT_arm64 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress-isas-arm @@ -43,7 +43,7 @@ jobs: buildConfig: checked platforms: - Linux_arm64 - - Windows_NT_arm64 + - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/jitstress-isas-x86.yml b/eng/pipelines/coreclr/jitstress-isas-x86.yml index 98beca7b6fa79..4f9978f75d720 100644 --- a/eng/pipelines/coreclr/jitstress-isas-x86.yml +++ b/eng/pipelines/coreclr/jitstress-isas-x86.yml @@ -23,8 +23,8 @@ jobs: platforms: - Linux_x64 - OSX_x64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_x64 + - windows_x86 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress-isas-x86 @@ -46,8 +46,8 @@ jobs: platforms: - Linux_x64 - OSX_x64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_x64 + - windows_x86 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/jitstress.yml b/eng/pipelines/coreclr/jitstress.yml index a78aaa620f0f4..bad86b7c5b7ec 100644 --- a/eng/pipelines/coreclr/jitstress.yml +++ b/eng/pipelines/coreclr/jitstress.yml @@ -32,9 +32,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress @@ -59,9 +59,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml index 743e071e08e89..3510c09abcd5d 100644 --- a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml @@ -26,9 +26,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstress2-jitstressregs @@ -53,9 +53,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/jitstressregs-x86.yml b/eng/pipelines/coreclr/jitstressregs-x86.yml index 9de11695b46af..387e159499d58 100644 --- a/eng/pipelines/coreclr/jitstressregs-x86.yml +++ b/eng/pipelines/coreclr/jitstressregs-x86.yml @@ -22,8 +22,8 @@ jobs: buildConfig: checked platforms: - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_x64 + - windows_x86 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstressregs-x86 @@ -44,8 +44,8 @@ jobs: buildConfig: checked platforms: - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_x64 + - windows_x86 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/jitstressregs.yml b/eng/pipelines/coreclr/jitstressregs.yml index 12c8fc5158873..337261e7d5ee2 100644 --- a/eng/pipelines/coreclr/jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstressregs.yml @@ -26,9 +26,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: jitstressregs @@ -53,9 +53,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/libraries-gcstress-extra.yml b/eng/pipelines/coreclr/libraries-gcstress-extra.yml index 4063b0a8ffb97..e3869102b2d7d 100644 --- a/eng/pipelines/coreclr/libraries-gcstress-extra.yml +++ b/eng/pipelines/coreclr/libraries-gcstress-extra.yml @@ -29,7 +29,7 @@ jobs: # libraries test build platforms testBuildPlatforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 # # Libraries Test Run using Release libraries, Checked CoreCLR, and stress modes diff --git a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml index d5df152153db3..5d49cb6f13a80 100644 --- a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml @@ -29,7 +29,7 @@ jobs: # libraries test build platforms testBuildPlatforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 # # Libraries Test Run using Release libraries, Checked CoreCLR, and stress modes diff --git a/eng/pipelines/coreclr/libraries-jitstress.yml b/eng/pipelines/coreclr/libraries-jitstress.yml index 91fae482d4470..4d12e1ccb8edd 100644 --- a/eng/pipelines/coreclr/libraries-jitstress.yml +++ b/eng/pipelines/coreclr/libraries-jitstress.yml @@ -33,14 +33,14 @@ jobs: - Linux_x64 - Linux_arm - Linux_arm64 - - Windows_NT_x86 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x86 + - windows_x64 + - windows_arm64 jobParameters: # libraries test build platforms testBuildPlatforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 # # Libraries Test Run using Release libraries, Checked CoreCLR, and stress modes @@ -53,9 +53,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_arm64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_arm64 + - windows_x64 + - windows_x86 helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml index d1a2a0afd0e52..b558def3d53e3 100644 --- a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml @@ -27,14 +27,14 @@ jobs: - Linux_x64 - Linux_arm - Linux_arm64 - - Windows_NT_x86 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x86 + - windows_x64 + - windows_arm64 jobParameters: # libraries test build platforms testBuildPlatforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 # # Libraries Test Run using Release libraries, Checked CoreCLR, and stress modes @@ -47,9 +47,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_arm64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_arm64 + - windows_x64 + - windows_x86 helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/libraries-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstressregs.yml index 691cb29b0d9f4..b4f9386b8a1bb 100644 --- a/eng/pipelines/coreclr/libraries-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstressregs.yml @@ -27,14 +27,14 @@ jobs: - Linux_x64 - Linux_arm - Linux_arm64 - - Windows_NT_x86 - - Windows_NT_x64 - - Windows_NT_arm64 + - windows_x86 + - windows_x64 + - windows_arm64 jobParameters: # libraries test build platforms testBuildPlatforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 # # Libraries Test Run using Release libraries, Checked CoreCLR, and stress modes @@ -47,9 +47,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_arm64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_arm64 + - windows_x64 + - windows_x86 helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index 8b12dae2dd1dc..a80e985fef1d3 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -34,8 +34,8 @@ jobs: buildConfig: release platforms: - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_x64 + - windows_x86 jobParameters: testGroup: perf @@ -128,8 +128,8 @@ jobs: runtimeFlavor: coreclr platforms: - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_x64 + - windows_x86 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release @@ -145,8 +145,8 @@ jobs: runtimeFlavor: coreclr platforms: - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_x64 + - windows_x86 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/r2r.yml b/eng/pipelines/coreclr/r2r.yml index a3b76e9d8e3ff..e8bde2dd259ce 100644 --- a/eng/pipelines/coreclr/r2r.yml +++ b/eng/pipelines/coreclr/r2r.yml @@ -22,10 +22,10 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_arm - - Windows_NT_arm64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_arm + - windows_arm64 + - windows_x64 + - windows_x86 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop @@ -48,10 +48,10 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_arm - - Windows_NT_arm64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_arm + - windows_arm64 + - windows_x64 + - windows_x86 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/runincontext.yml b/eng/pipelines/coreclr/runincontext.yml index 64e6fe6205a3b..037dad2a3f16d 100644 --- a/eng/pipelines/coreclr/runincontext.yml +++ b/eng/pipelines/coreclr/runincontext.yml @@ -20,8 +20,8 @@ jobs: buildConfig: checked platforms: - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_x64 + - windows_x86 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop @@ -42,8 +42,8 @@ jobs: buildConfig: checked platforms: - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 + - windows_x64 + - windows_x86 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/superpmi.yml b/eng/pipelines/coreclr/superpmi.yml index 5fb435365182b..3ae264540b1f9 100644 --- a/eng/pipelines/coreclr/superpmi.yml +++ b/eng/pipelines/coreclr/superpmi.yml @@ -27,9 +27,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 jobParameters: testGroup: outerloop @@ -54,9 +54,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -74,9 +74,9 @@ jobs: - Linux_arm - Linux_arm64 - Linux_x64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm64 - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml diff --git a/eng/pipelines/coreclr/templates/build-jit-job.yml b/eng/pipelines/coreclr/templates/build-jit-job.yml index a5f31d4d3b55f..e07a0d272ab79 100644 --- a/eng/pipelines/coreclr/templates/build-jit-job.yml +++ b/eng/pipelines/coreclr/templates/build-jit-job.yml @@ -50,7 +50,7 @@ jobs: - name: compilerArg value: '' - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - name: compilerArg value: '-clang9' # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there @@ -62,12 +62,12 @@ jobs: - name: compilerArg value: '' - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - name: PythonScript value: 'py -3' - name: PipScript value: 'py -3 -m pip' - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - name: PythonScript value: 'python3' - name: PipScript @@ -84,7 +84,7 @@ jobs: - ${{ if eq(parameters.osGroup, 'OSX') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO displayName: Install native dependencies - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: # Necessary to install python - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies @@ -97,10 +97,10 @@ jobs: - template: /eng/pipelines/common/restore-internal-tools.yml # Build CoreCLR JIT - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) $(crossArg) -ci $(compilerArg) -skipruntime -nopgooptimize displayName: Build CoreCLR JIT - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -skipruntime -nopgooptimize -skiprestoreoptdata displayName: Build CoreCLR JIT diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index de501480b7674..beb779bc605b3 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -74,7 +74,7 @@ jobs: value: '-gcc' - name: publishLogsArtifactPrefix value: 'BuildLogs_CoreCLR_GCC' - - ${{ if and(ne(parameters.osGroup, 'Windows_NT'), ne(parameters.compilerName, 'gcc')) }}: + - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}: - name: compilerArg value: '-clang9' # Building for x64 MUSL happens on Alpine Linux and we need to use the stable version available there @@ -102,7 +102,7 @@ jobs: - name: enforcePgoArg value: '' # The EnforcePGO script is only supported on Windows and is not supported on arm or arm64. - - ${{ if and(eq(parameters.buildConfig, 'Release'), and(eq(parameters.osGroup, 'Windows_NT'), not(or(eq(parameters.archType, 'arm64'), eq(parameters.archType, 'arm'))))) }}: + - ${{ if and(eq(parameters.buildConfig, 'Release'), and(eq(parameters.osGroup, 'windows'), not(or(eq(parameters.archType, 'arm64'), eq(parameters.archType, 'arm'))))) }}: - name: enforcePgoArg value: '-enforcepgo' @@ -120,7 +120,7 @@ jobs: - name: ninjaArg value: '' - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - name: ninjaArg value: '-ninja' @@ -135,7 +135,7 @@ jobs: - ${{ if eq(parameters.osGroup, 'OSX') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO displayName: Install native dependencies - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: # Necessary to install python - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies @@ -154,15 +154,15 @@ jobs: displayName: Disk Usage before Build # Build DacTableGen (Windows-only) - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset clr.dactools $(crossArg) -arch $(archType) $(osArg) -c $(buildConfig) $(officialBuildIdArg) -ci /bl:$(Build.SourcesDirectory)artifacts/logs/$(buildConfig)/DacTools.binlog displayName: Build managed product components and packages # Build CoreCLR Runtime - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) $(crossArg) $(osArg) -ci $(compilerArg) $(clrBuildPALTestsBuildArg) $(ninjaArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) displayName: Build CoreCLR Runtime - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci $(ninjaArg) $(enforcePgoArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) displayName: Build CoreCLR Runtime @@ -209,7 +209,7 @@ jobs: overWrite: true # Sign on Windows - - ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(parameters.signBinaries, 'true'), ne(parameters.testGroup, 'clrTools')) }}: + - ${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.signBinaries, 'true'), ne(parameters.testGroup, 'clrTools')) }}: - powershell: eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:TargetOS=$(osGroup) /p:TargetArchitecture=$(archType) /p:Configuration=$(_BuildConfig) /p:DotNetSignType=$env:_SignType -projects $(Build.SourcesDirectory)\eng\empty.csproj displayName: Sign Binaries @@ -234,7 +234,7 @@ jobs: artifactName: $(buildProductArtifactName) displayName: 'product build' - - ${{ if and(in(parameters.osGroup, 'Windows_NT', 'Linux'), ne(parameters.archType, 'x86'), ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, 'clrTools')) }}: + - ${{ if and(in(parameters.osGroup, 'windows', 'Linux'), ne(parameters.archType, 'x86'), ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, 'clrTools')) }}: - template: /eng/pipelines/coreclr/templates/crossdac-build.yml parameters: archType: ${{ parameters.archType }} diff --git a/eng/pipelines/coreclr/templates/crossdac-build.yml b/eng/pipelines/coreclr/templates/crossdac-build.yml index 44fd80157f965..216485692c649 100644 --- a/eng/pipelines/coreclr/templates/crossdac-build.yml +++ b/eng/pipelines/coreclr/templates/crossdac-build.yml @@ -5,13 +5,13 @@ parameters: steps: # Always build the crossdac, that way we know in CI/PR if things break to build. - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - ${{ if notin(parameters.archType, 'x86') }}: - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -linuxdac $(officialBuildIdArg) displayName: Build Cross OS Linux DAC for Windows - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - ${{ if notin(parameters.archType, 'x86') }}: - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -alpinedac $(officialBuildIdArg) displayName: Build Cross OS Linux-musl DAC for Windows diff --git a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml index 3faae1209c103..5275bb19dd9f3 100644 --- a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml @@ -53,7 +53,7 @@ jobs: value: $(osGroup).$(archType).$(buildConfigUpper) - name: crossFlavor value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper) - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - name: artifactsDirectory value: $(Build.SourcesDirectory)/artifacts - name: binDirectory @@ -62,7 +62,7 @@ jobs: value: $(binDirectory)/coreclr - name: workItemDirectory value: $(artifactsDirectory)/tests/coreclr/$(targetFlavor)/Tests/Core_Root - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - name: artifactsDirectory value: $(Build.SourcesDirectory)\artifacts - name: binDirectory @@ -110,12 +110,12 @@ jobs: displayName: Populate Core_Root # Create directories and ensure crossgen is executable - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: | chmod +x $(workItemDirectory)/crossgen mkdir -p $(workItemDirectory)/log/$(crossFlavor) displayName: Create directories and ensure crossgen is executable - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - script: | mkdir $(workItemDirectory)\log\$(crossFlavor) displayName: Create directories @@ -127,14 +127,14 @@ jobs: scriptSource: 'filePath' scriptPath: $(Build.SourcesDirectory)/src/tests/Common/scripts/crossgen_comparison.py pythonInterpreter: /usr/bin/python3 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + ${{ if ne(parameters.osGroup, 'windows') }}: arguments: crossgen_framework --crossgen $(productDirectory)/$(targetFlavor)/$(hostArchType)/crossgen --il_corelib $(productDirectory)/$(targetFlavor)/IL/System.Private.CoreLib.dll --core_root $(workItemDirectory) --result_dir $(workItemDirectory)/log/$(crossFlavor) - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + ${{ if eq(parameters.osGroup, 'windows') }}: arguments: crossgen_framework --crossgen $(productDirectory)\$(targetFlavor)\$(hostArchType)\crossgen @@ -143,12 +143,12 @@ jobs: --result_dir $(workItemDirectory)\log\$(crossFlavor) # Dump contents and payload information - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: | ls $(workItemDirectory) du -sh $(workItemDirectory) displayName: Dump contents and payload information - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - script: | dir $(workItemDirectory) displayName: Dump contents and payload information @@ -167,7 +167,7 @@ jobs: WorkItemTimeout: 3:00 # 3 hours WorkItemDirectory: '$(workItemDirectory)' CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/src/tests/Common/scripts' - ${{ if ne(parameters.osName, 'Windows_NT') }}: + ${{ if ne(parameters.osName, 'windows') }}: WorkItemCommand: chmod +x $HELIX_WORKITEM_PAYLOAD/crossgen; mkdir -p $HELIX_WORKITEM_PAYLOAD/log/$(targetFlavor); @@ -179,7 +179,7 @@ jobs: python3 -u $HELIX_CORRELATION_PAYLOAD/crossgen_comparison.py compare --base_dir $HELIX_WORKITEM_PAYLOAD/log/$(crossFlavor) --diff_dir $HELIX_WORKITEM_PAYLOAD/log/$(targetFlavor) - ${{ if eq(parameters.osName, 'Windows_NT') }}: + ${{ if eq(parameters.osName, 'windows') }}: WorkItemCommand: mkdir %HELIX_WORKITEM_PAYLOAD%\log\$(targetFlavor); python3 -u %HELIX_CORRELATION_PAYLOAD%\crossgen_comparison.py crossgen_framework diff --git a/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml b/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml index 9bcd11057ed3c..106ce38047531 100644 --- a/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml @@ -63,7 +63,7 @@ jobs: value: $(artifactsDirectory)$(dir)tests$(dir)coreclr$(dir)$(targetFlavor)$(dir)Tests$(dir)CrossCompileRoot - name: crossgencompare_build_artifact value: crossgen_comparison_build_$(osGroup)$(osSubgroup)_$(archType) - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - name: target_crossgen2_os value: windows - ${{ if eq(parameters.osGroup, 'Linux') }}: @@ -118,7 +118,7 @@ jobs: displayName: Populate Core_Root # Create work item directory and populate with assemblies - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: | mkdir -p $(workItemDirectory) mkdir -p $(workItemDirectory)/log @@ -127,7 +127,7 @@ jobs: cp $(productDirectory)/$(targetFlavor)/IL/System.Private.CoreLib.dll $(workItemDirectory)/dlls displayName: Create directories failOnStderr: true - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - script: | md $(workItemDirectory)\log md $(workItemDirectory)\dlls @@ -144,7 +144,7 @@ jobs: inputs: scriptSource: 'filePath' scriptPath: $(Build.SourcesDirectory)/src/tests/Common/scripts/crossgen2_comparison.py - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + ${{ if ne(parameters.osGroup, 'windows') }}: pythonInterpreter: /usr/bin/python3 arguments: crossgen_framework @@ -154,7 +154,7 @@ jobs: --result_dir $(workItemDirectory)/log --target_os $(target_crossgen2_os) --target_arch $(archType) - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + ${{ if eq(parameters.osGroup, 'windows') }}: arguments: crossgen_framework --crossgen $(crossgen2location) diff --git a/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml index 7d825e93f5416..94e4c34e833de 100644 --- a/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml @@ -67,7 +67,7 @@ jobs: value: ${{ parameters.targetarch }} - name: crossgencompare_build_artifact value: crossgen_comparison_build_${{ parameters.targetos }}_${{ parameters.targetarch }} - - ${{ if eq(parameters.targetos, 'Windows_NT') }}: + - ${{ if eq(parameters.targetos, 'windows') }}: - name: target_crossgen2_os value: windows - ${{ if eq(parameters.targetos, 'Linux') }}: @@ -136,7 +136,7 @@ jobs: WorkItemTimeout: 3:00 # 3 hours WorkItemDirectory: '$(workItemDirectory)' CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/src/tests/Common/scripts' - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + ${{ if ne(parameters.osGroup, 'windows') }}: WorkItemCommand: echo Targeting $(targetFlavor) ; chmod +x $HELIX_WORKITEM_PAYLOAD/corerun; @@ -152,7 +152,7 @@ jobs: python3 -u $HELIX_CORRELATION_PAYLOAD/crossgen2_comparison.py compare --base_dir $HELIX_WORKITEM_PAYLOAD/prebuiltWork/log --diff_dir $HELIX_WORKITEM_PAYLOAD/log - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + ${{ if eq(parameters.osGroup, 'windows') }}: WorkItemCommand: echo Targeting $(targetFlavor) & md %HELIX_WORKITEM_PAYLOAD%\log & diff --git a/eng/pipelines/coreclr/templates/format-job.yml b/eng/pipelines/coreclr/templates/format-job.yml index 18aaf6ea34d70..5699ccb1d3d36 100644 --- a/eng/pipelines/coreclr/templates/format-job.yml +++ b/eng/pipelines/coreclr/templates/format-job.yml @@ -28,10 +28,10 @@ jobs: name: ${{ format('format_{0}{1}_{2}', parameters.osGroup, parameters.osSubgroup, parameters.archType) }} displayName: ${{ format('Formatting {0}{1} {2}', parameters.osGroup, parameters.osSubgroup, parameters.archType) }} helixType: 'format' - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + ${{ if eq(parameters.osGroup, 'windows') }}: pool: vmImage: 'windows-2019' - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + ${{ if ne(parameters.osGroup, 'windows') }}: pool: ${{ parameters.pool }} variables: ${{ parameters.variables }} condition: ${{ parameters.condition }} @@ -49,7 +49,7 @@ jobs: versionSpec: '3.x' addToPath: true architecture: 'x64' - condition: ${{ eq(parameters.osGroup, 'Windows_NT') }} + condition: ${{ eq(parameters.osGroup, 'windows') }} - task: PythonScript@0 displayName: Run tests/scripts/format.py inputs: diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 6bcef8752c2ed..dfd5f9bd3ef03 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -99,8 +99,8 @@ jobs: - OSX.1014.Amd64 - OSX.1015.Amd64 - # Windows_NT x64 - - ${{ if eq(parameters.platform, 'Windows_NT_x64') }}: + # windows x64 + - ${{ if eq(parameters.platform, 'windows_x64') }}: - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: - Windows.10.Amd64.Open - ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: @@ -115,8 +115,8 @@ jobs: - Windows.10.Amd64.Core - (Windows.Nano.1809.Amd64.Open)windows.10.amd64.serverrs5.open@mcr.microsoft.com/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504 - # Windows_NT x86 - - ${{ if eq(parameters.platform, 'Windows_NT_x86') }}: + # windows x86 + - ${{ if eq(parameters.platform, 'windows_x86') }}: - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: - Windows.10.Amd64.Open - ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: @@ -129,15 +129,15 @@ jobs: - Windows.10.Amd64 - Windows.10.Amd64.Core - # Windows_NT arm - - ${{ if eq(parameters.platform, 'Windows_NT_arm') }}: + # windows arm + - ${{ if eq(parameters.platform, 'windows_arm') }}: - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: - Windows.10.Arm64v8.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - Windows.10.Arm64 - # Windows_NT arm64 - - ${{ if eq(parameters.platform, 'Windows_NT_arm64') }}: + # windows arm64 + - ${{ if eq(parameters.platform, 'windows_arm64') }}: - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: - Windows.10.Arm64v8.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index b6101f39dc193..74a3015ed15d8 100644 --- a/eng/pipelines/coreclr/templates/perf-job.yml +++ b/eng/pipelines/coreclr/templates/perf-job.yml @@ -49,12 +49,12 @@ jobs: - ${{ if eq(parameters.runtimeType, 'wasm') }}: - ${{ format('build_{0}{1}_{2}_{3}_{4}', 'Browser', '', 'wasm', parameters.buildConfig, parameters.runtimeType) }} - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + ${{ if eq(parameters.osGroup, 'windows') }}: ${{ if eq(parameters.runtimeType, 'mono') }}: extraSetupParameters: -Architecture ${{ parameters.archType }} -MonoDotnet $(Build.SourcesDirectory)\.dotnet-mono ${{ if eq(parameters.runtimeType, 'coreclr') }}: extraSetupParameters: -CoreRootDirectory $(Build.SourcesDirectory)\artifacts\tests\coreclr\${{ parameters.osGroup }}.${{ parameters.archType }}.Release\Tests\Core_Root -Architecture ${{ parameters.archType }} - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + ${{ if ne(parameters.osGroup, 'windows') }}: ${{ if eq(parameters.runtimeType, 'mono') }}: extraSetupParameters: --architecture ${{ parameters.archType }} --monodotnet $(Build.SourcesDirectory)/.dotnet-mono ${{ if eq(parameters.runtimeType, 'wasm') }}: @@ -117,8 +117,8 @@ jobs: # Copy the runtime directory into the testhost folder to include OOBs. - script: "build.cmd -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)\\bin\\mono\\$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;xcopy $(Build.SourcesDirectory)\\artifacts\\bin\\runtime\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\* $(Build.SourcesDirectory)\\artifacts\\bin\\testhost\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\shared\\Microsoft.NETCore.App\\6.0.0 /E /I /Y;xcopy $(Build.SourcesDirectory)\\artifacts\\bin\\testhost\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\* $(Build.SourcesDirectory)\\.dotnet-mono /E /I /Y;copy $(Build.SourcesDirectory)\\artifacts\\bin\\coreclr\\$(osGroup).$(archType).$(buildConfigUpper)\\corerun.exe $(Build.SourcesDirectory)\\.dotnet-mono\\shared\\Microsoft.NETCore.App\\6.0.0\\corerun.exe" displayName: "Create mono dotnet (Windows)" - condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), eq(variables.osGroup, 'Windows_NT')) + condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), eq(variables.osGroup, 'windows')) - script: "mkdir $(Build.SourcesDirectory)/.dotnet-mono;./build.sh -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)/bin/mono/$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;cp $(Build.SourcesDirectory)/artifacts/bin/runtime/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/* $(Build.SourcesDirectory)/artifacts/bin/testhost/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/shared/Microsoft.NETCore.App/6.0.0 -rf;cp $(Build.SourcesDirectory)/artifacts/bin/testhost/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/* $(Build.SourcesDirectory)/.dotnet-mono -r;cp $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)/corerun $(Build.SourcesDirectory)/.dotnet-mono/shared/Microsoft.NETCore.App/6.0.0/corerun" displayName: "Create mono dotnet (Linux)" - condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), ne(variables.osGroup, 'Windows_NT')) + condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), ne(variables.osGroup, 'windows')) diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml index 7cbead38035f5..5ae14ec9dc2c7 100644 --- a/eng/pipelines/coreclr/templates/run-performance-job.yml +++ b/eng/pipelines/coreclr/templates/run-performance-job.yml @@ -60,31 +60,31 @@ jobs: - Interpreter: '' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq( parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq( parameters.osGroup, 'windows') }}: - HelixPreCommand: $(HelixPreCommandStemWindows);$(ExtraMSBuildLogsWindows) - IsInternal: -Internal - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - HelixPreCommand: $(HelixPreCommandStemLinux);$(ExtraMSBuildLogsLinux) - IsInternal: --internal - group: DotNet-HelixApi-Access - group: dotnet-benchview - ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}: - - ${{ if eq( parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq( parameters.osGroup, 'windows') }}: - HelixPreCommand: $(ExtraMSBuildLogsWindows) - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - HelixPreCommand: $(ExtraMSBuildLogsLinux);npm install --prefix $HELIX_WORKITEM_PAYLOAD jsvu -g;$HELIX_WORKITEM_PAYLOAD/bin/jsvu --os=linux64 --engines=v8 - ${{ if and(eq(parameters.codeGenType, 'Interpreter'), eq(parameters.runtimeType, 'mono')) }}: - - ${{ if eq( parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq( parameters.osGroup, 'windows') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - HelixPreCommand: '$(HelixPreCommandStemWindows);set MONO_ENV_OPTIONS="--interpreter";$(ExtraMSBuildLogsWindows)' - Interpreter: ' -MonoInterpreter' - ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}: - HelixPreCommand: 'set MONO_ENV_OPTIONS="--interpreter";$(ExtraMSBuildLogsWindows)' - Interpreter: ' -MonoInterpreter' - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - HelixPreCommand: '$(HelixPreCommandStemLinux);export MONO_ENV_OPTIONS="--interpreter";$(ExtraMSBuildLogsLinux)' - Interpreter: ' --monointerpreter' @@ -107,11 +107,11 @@ jobs: - ${{ parameters.steps }} - powershell: $(Build.SourcesDirectory)\eng\common\performance\performance-setup.ps1 $(IsInternal)$(Interpreter) -Framework $(_Framework) -Kind ${{ parameters.runKind }} ${{ parameters.extraSetupParameters }} displayName: Performance Setup (Windows) - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), eq(variables['Agent.Os'], 'windows')) continueOnError: ${{ parameters.continueOnError }} - script: $(Build.SourcesDirectory)/eng/common/performance/performance-setup.sh $(IsInternal)$(Interpreter) --framework $(_Framework) --kind ${{ parameters.runKind }} ${{ parameters.extraSetupParameters }} displayName: Performance Setup (Unix) - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), ne(variables['Agent.Os'], 'windows')) continueOnError: ${{ parameters.continueOnError }} - script: $(Python) $(PerformanceDirectory)/scripts/ci_setup.py $(SetupArguments) displayName: Run ci setup script diff --git a/eng/pipelines/coreclr/templates/run-scenarios-job.yml b/eng/pipelines/coreclr/templates/run-scenarios-job.yml index 84451af185769..1e7aeb855bc06 100644 --- a/eng/pipelines/coreclr/templates/run-scenarios-job.yml +++ b/eng/pipelines/coreclr/templates/run-scenarios-job.yml @@ -55,17 +55,17 @@ jobs: - SharedHelixPreCommands: '' - AdditionalHelixPreCommands: '' # run machine-setup and set PYTHONPATH for both public and private jobs - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - SharedHelixPreCommands: 'call %HELIX_WORKITEM_PAYLOAD%\machine-setup.cmd;set PYTHONPATH=%HELIX_WORKITEM_PAYLOAD%\scripts%3B%HELIX_WORKITEM_PAYLOAD%' - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - SharedHelixPreCommands: 'chmod +x $HELIX_WORKITEM_PAYLOAD/machine-setup.sh;. $HELIX_WORKITEM_PAYLOAD/machine-setup.sh;export PYTHONPATH=$HELIX_WORKITEM_PAYLOAD/scripts:$HELIX_WORKITEM_PAYLOAD' # extra private job settings - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - AdditionalHelixPreCommands: 'py -3 -m venv %HELIX_WORKITEM_PAYLOAD%\.venv;call %HELIX_WORKITEM_PAYLOAD%\.venv\Scripts\activate.bat;set PYTHONPATH=;py -3 -m pip install --user azure.storage.blob==12.0.0 --force-reinstall;py -3 -m pip install --user azure.storage.queue==12.0.0 --force-reinstall;set "PERFLAB_UPLOAD_TOKEN=$(PerfCommandUploadToken)"' - IsInternal: -Internal - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - AdditionalHelixPreCommands: 'sudo apt-get -y install python3-venv;python3 -m venv $HELIX_WORKITEM_PAYLOAD/.venv;source $HELIX_WORKITEM_PAYLOAD/.venv/Scripts/activate;export PYTHONPATH=;pip3 install --user azure.storage.blob==12.0.0 --force-reinstall;pip3 install --user azure.storage.queue==12.0.0 --force-reinstall;export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"' - IsInternal: --internal - group: DotNet-HelixApi-Access @@ -86,11 +86,11 @@ jobs: # run performance-setup - powershell: $(Build.SourcesDirectory)\eng\common\performance\performance-setup.ps1 $(IsInternal) -Framework $(_Framework) -Kind ${{ parameters.runKind }} ${{ parameters.extraSetupParameters }} ${{ parameters.additionalSetupParameters }} displayName: Performance Setup (Windows) - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), eq(variables['Agent.Os'], 'windows')) continueOnError: ${{ parameters.continueOnError }} - script: $(Build.SourcesDirectory)/eng/common/performance/performance-setup.sh $(IsInternal) --framework $(_Framework) --kind ${{ parameters.runKind }} ${{ parameters.extraSetupParameters }} ${{ parameters.additionalSetupParameters }} displayName: Performance Setup (Linux) - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), ne(variables['Agent.Os'], 'windows')) continueOnError: ${{ parameters.continueOnError }} # parse Version.props to get the latest stable sdk version on master - script: $(Python) scripts/parse_props.py --branch-name master # defaults to master branch of sdk so we can get the latest @@ -100,10 +100,10 @@ jobs: # run ci-setup - script: $(Python) $(PerformanceDirectory)\scripts\ci_setup.py $(DotnetVersion) $(SetupArguments) --install-dir $(PayloadDirectory)\dotnet --output-file $(WorkItemDirectory)\machine-setup.cmd displayName: Run ci setup script (Windows) - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), eq(variables['Agent.Os'], 'windows')) - script: $(Python) $(PerformanceDirectory)/scripts/ci_setup.py $(DotnetVersion) $(SetupArguments) --install-dir $(PayloadDirectory)/dotnet --output-file $(WorkItemDirectory)/machine-setup.sh displayName: Run ci setup script (Linux) - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), ne(variables['Agent.Os'], 'windows')) # copy wasm packs if running on wasm - script: cp -r $(librariesDownloadDir)/BrowserWasm/artifacts/bin/microsoft.netcore.app.runtime.browser-wasm $(PayloadDirectory);cp -r $(librariesDownloadDir)/BrowserWasm/artifacts/bin/microsoft.netcore.app.ref $(PayloadDirectory) displayName: Copy browserwasm and runtime ref packs @@ -111,32 +111,32 @@ jobs: # copy scenario support files - script: xcopy $(PerformanceDirectory)\scripts $(WorkItemDirectory)\scripts\/e && xcopy $(PerformanceDirectory)\src\scenarios\shared $(WorkItemDirectory)\shared\/e && xcopy $(PerformanceDirectory)\src\scenarios\staticdeps $(WorkItemDirectory)\staticdeps\/e displayName: Copy scenario support files (Windows) - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), eq(variables['Agent.Os'], 'windows')) - script: cp -r $(PerformanceDirectory)/scripts $(WorkItemDirectory)/scripts/ && cp -r $(PerformanceDirectory)/src/scenarios/shared $(WorkItemDirectory)/shared/ && cp -r $(PerformanceDirectory)/src/scenarios/staticdeps/ $(WorkItemDirectory)/staticdeps/ displayName: Copy scenario support files (Linux) - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), ne(variables['Agent.Os'], 'windows')) # build Startup - script: $(PayloadDirectory)\dotnet\dotnet.exe publish -c Release -o $(WorkItemDirectory)\Startup -f netcoreapp3.1 -r win-$(Architecture) $(PerformanceDirectory)\src\tools\ScenarioMeasurement\Startup\Startup.csproj displayName: Build Startup tool (Windows) env: PERFLAB_TARGET_FRAMEWORKS: netcoreapp3.1 - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), eq(variables['Agent.Os'], 'windows')) - script: $(PayloadDirectory)/dotnet/dotnet publish -c Release -o $(WorkItemDirectory)/startup -f netcoreapp3.1 -r linux-$(Architecture) $(PerformanceDirectory)/src/tools/ScenarioMeasurement/Startup/Startup.csproj displayName: Build Startup tool (Linux) env: PERFLAB_TARGET_FRAMEWORKS: netcoreapp3.1 - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), ne(variables['Agent.Os'], 'windows')) # build SizeOnDisk - script: $(PayloadDirectory)\dotnet\dotnet.exe publish -c Release -o $(WorkItemDirectory)SOD -f netcoreapp3.1 -r win-$(Architecture) $(PerformanceDirectory)\src\tools\ScenarioMeasurement\SizeOnDisk\SizeOnDisk.csproj displayName: Build SizeOnDisk tool (Windows) env: PERFLAB_TARGET_FRAMEWORKS: netcoreapp3.1 - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), eq(variables['Agent.Os'], 'windows')) - script: $(PayloadDirectory)/dotnet/dotnet publish -c Release -o $(WorkItemDirectory)/SOD -f netcoreapp3.1 -r linux-$(Architecture) $(PerformanceDirectory)/src/tools/ScenarioMeasurement/SizeOnDisk/SizeOnDisk.csproj displayName: Build SizeOnDisk tool (Linux) env: PERFLAB_TARGET_FRAMEWORKS: netcoreapp3.1 - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + condition: and(succeeded(), ne(variables['Agent.Os'], 'windows')) # run perf testing in helix - template: /eng/common/templates/steps/perf-send-to-helix.yml diff --git a/eng/pipelines/coreclr/templates/run-superpmi-job.yml b/eng/pipelines/coreclr/templates/run-superpmi-job.yml index 9f835a16b4865..7c7b96e0a8ee8 100644 --- a/eng/pipelines/coreclr/templates/run-superpmi-job.yml +++ b/eng/pipelines/coreclr/templates/run-superpmi-job.yml @@ -61,7 +61,7 @@ jobs: - MchFileTag: '${{ parameters.osGroup }}.${{ parameters.archType }}.${{ parameters.buildConfig }}' - CollectionName: ${{ parameters.collectionName }} - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - name: PythonScript value: 'py -3' - name: PipScript @@ -70,7 +70,7 @@ jobs: value: '$(Build.SourcesDirectory)\artifacts\tests\coreclr\${{ parameters.osGroup }}.${{ parameters.archType }}.${{ parameters.buildConfig }}\Tests\Core_Root' - name: MchFilesLocation value: '$(Build.SourcesDirectory)\artifacts\helixresults\' - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - name: PythonScript value: 'python3' - name: PipScript diff --git a/eng/pipelines/coreclr/templates/xplat-job.yml b/eng/pipelines/coreclr/templates/xplat-job.yml index 7dde73e23b25a..7a2a0cd7ca84f 100644 --- a/eng/pipelines/coreclr/templates/xplat-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-job.yml @@ -61,8 +61,8 @@ jobs: agentOs: FreeBSD ${{ if eq(parameters.osGroup, 'OSX') }}: agentOs: MacOS - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - agentOs: Windows_NT + ${{ if eq(parameters.osGroup, 'windows') }}: + agentOs: windows # Setting this results in the arcade job template including a step # that gathers asset manifests and publishes them to pipeline diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index ad5088d8999bb..00ae63eb25bd2 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -127,10 +127,10 @@ jobs: # 'innerloop' and 'clrinterpreter' jobs run the Priority 0 tests; everything else runs the Priority 1 tests. - ${{ if and(ne(parameters.testGroup, 'innerloop'), ne(parameters.testGroup, 'clrinterpreter')) }}: - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - name: priorityArg value: 'priority1' - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - name: priorityArg value: '-priority=1' diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index 9721eb4b9f479..0f3f3e64f6465 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -42,7 +42,7 @@ jobs: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: release platforms: - - Windows_NT_x86 + - windows_x86 - OSX_x64 jobParameters: testGroup: innerloop @@ -87,7 +87,7 @@ jobs: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: debug platforms: - - Windows_NT_x64 + - windows_x64 jobParameters: testGroup: innerloop nameSuffix: Mono_Libraries diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index a769413019d66..5ace7f310d473 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -98,7 +98,7 @@ jobs: ### Platform-specific variable setup ### - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - name: CommonMSBuildArgs value: >- @@ -354,7 +354,7 @@ jobs: parameters.archType, parameters.liveLibrariesBuildConfig) }} - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}: - - libraries_build_allconfigurations_Windows_NT_x64_Release + - libraries_build_allconfigurations_windows_x64_Release - ${{ if eq(parameters.buildFullPlatformManifest, true) }}: - ${{ each platform in parameters.platforms }}: - ${{ parameters.runtimeFlavor }}_${{ parameters.runtimeVariant }}_product_build_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }} @@ -369,7 +369,7 @@ jobs: parameters.liveRuntimeBuildConfig, parameters.globalBuildSuffix) }} - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}: - - build_Windows_NT_x64_${{ parameters.liveLibrariesBuildConfig }}_AllConfigurations + - build_windows_x64_${{ parameters.liveLibrariesBuildConfig }}_AllConfigurations steps: @@ -391,7 +391,7 @@ jobs: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: NuGetAuthenticate@0 - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: # NuGet's http cache lasts 30 minutes. If we're on a static machine, this may interfere with # auto-update PRs by preventing the CI build from fetching the new version. Delete the cache. - powershell: Remove-Item -Recurse -ErrorAction Ignore "$env:LocalAppData\NuGet\v3-cache" @@ -549,7 +549,7 @@ jobs: continueOnError: true condition: succeededOrFailed() - - ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(parameters.isOfficialBuild, true)) }}: + - ${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.isOfficialBuild, true)) }}: - task: NuGetCommand@2 displayName: Push Visual Studio NuPkgs inputs: @@ -570,7 +570,7 @@ jobs: skipTests: $(SkipTests) isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }} - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: set -x && df -h displayName: Check remaining storage space condition: always() diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 7a034f5ee4a25..452de634be2d9 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -102,11 +102,11 @@ jobs: - _testRunNamePrefixSuffix: ${{ parameters.testDisplayName }} # Windows variables - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - _runtimeOSArg: /p:RuntimeOS=win10 # Non-Windows variables - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - _buildScript: ./$(_buildScriptFileName)$(scriptExt) - _buildArguments: $(_runtimeConfigurationArg) -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_testModeArg) $(_testScopeArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg) $(_crossBuildPropertyArg) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index c0e13a2ca68e5..84f09c6ba8fcd 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -101,8 +101,8 @@ jobs: - ${{ if in(parameters.platform, 'iOS_x64', 'iOS_x86') }}: - OSX.1015.Amd64.Open - # Windows_NT x64 - - ${{ if eq(parameters.platform, 'Windows_NT_x64') }}: + # windows x64 + - ${{ if eq(parameters.platform, 'windows_x64') }}: # netcoreapp - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net48') }}: - ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}: @@ -130,8 +130,8 @@ jobs: - ${{ if eq(parameters.jobParameters.framework, 'allConfigurations') }}: - Windows.10.Amd64.Server19H1.Open - # Windows_NT x86 - - ${{ if eq(parameters.platform, 'Windows_NT_x86') }}: + # windows x86 + - ${{ if eq(parameters.platform, 'windows_x86') }}: # netcoreapp - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net48') }}: - ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}: @@ -153,12 +153,12 @@ jobs: - ${{ if eq(parameters.jobParameters.framework, 'net48') }}: - Windows.10.Amd64.Client19H1.Open - # Windows_NT arm - - ${{ if eq(parameters.platform, 'Windows_NT_arm') }}: + # windows arm + - ${{ if eq(parameters.platform, 'windows_arm') }}: - Windows.10.Arm64v8.Open - # Windows_NT arm64 - - ${{ if eq(parameters.platform, 'Windows_NT_arm64') }}: + # windows arm64 + - ${{ if eq(parameters.platform, 'windows_arm64') }}: - Windows.10.Arm64.Open # WebAssembly diff --git a/eng/pipelines/libraries/outerloop-mono.yml b/eng/pipelines/libraries/outerloop-mono.yml index a7eb7dfe3afd9..3bf80f8b9db3e 100644 --- a/eng/pipelines/libraries/outerloop-mono.yml +++ b/eng/pipelines/libraries/outerloop-mono.yml @@ -22,10 +22,10 @@ jobs: buildConfig: Release runtimeFlavor: mono platforms: - - Windows_NT_x86 + - windows_x86 - Browser_wasm - ${{ if eq(variables['isFullMatrix'], true) }}: - - Windows_NT_x64 + - windows_x64 - Linux_x64 - Linux_arm - Linux_musl_x64 @@ -51,7 +51,7 @@ jobs: buildConfig: Debug runtimeFlavor: mono platforms: - - Windows_NT_x64 + - windows_x64 - Linux_x64 - Linux_musl_x64 - OSX_x64 diff --git a/eng/pipelines/libraries/outerloop.yml b/eng/pipelines/libraries/outerloop.yml index 1718d174bf852..62ed9459c9d34 100644 --- a/eng/pipelines/libraries/outerloop.yml +++ b/eng/pipelines/libraries/outerloop.yml @@ -23,8 +23,8 @@ jobs: buildConfig: release platforms: - ${{ if eq(variables['includeWindowsOuterloop'], true) }}: - - Windows_NT_x64 - - Windows_NT_x86 + - windows_x64 + - windows_x86 - ${{ if eq(variables['includeLinuxOuterloop'], true) }}: - Linux_x64 - Linux_musl_x64 @@ -45,9 +45,9 @@ jobs: buildConfig: Release platforms: - ${{ if eq(variables['includeWindowsOuterloop'], true) }}: - - Windows_NT_x86 + - windows_x86 - ${{ if eq(variables['isFullMatrix'], true) }}: - - Windows_NT_x64 + - windows_x64 - ${{ if eq(variables['includeLinuxOuterloop'], true) }}: - ${{ if eq(variables['isFullMatrix'], true) }}: - Linux_x64 @@ -72,7 +72,7 @@ jobs: buildConfig: Debug platforms: - ${{ if eq(variables['includeWindowsOuterloop'], true) }}: - - Windows_NT_x64 + - windows_x64 - ${{ if eq(variables['includeLinuxOuterloop'], true) }}: - Linux_x64 - Linux_musl_x64 @@ -92,9 +92,9 @@ jobs: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: Release platforms: - - Windows_NT_x86 + - windows_x86 - ${{ if eq(variables['isFullMatrix'], true) }}: - - Windows_NT_x64 + - windows_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isOfficialBuild: ${{ variables['isOfficialBuild'] }} diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index e0f0e1e91196a..11e4341c7af99 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -91,12 +91,12 @@ jobs: # We need to find and download the GC stress dependencies (namely, coredistools). Put them # in the 'sharedFramework' directory where we unpacked the CoreCLR build artifacts. The 'sharedFramework' # directory is what is copied into the testhost. - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - script: $(Build.SourcesDirectory)\src\coreclr\tests\setup-stress-dependencies.cmd /arch ${{ parameters.archType }} /outputdir $(_runtimeDownloadPath)/sharedFramework displayName: Download GC stress dependencies - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: $(Build.SourcesDirectory)/src/coreclr/tests/setup-stress-dependencies.sh --arch=${{ parameters.archType }} --outputDir=$(_runtimeDownloadPath)/sharedFramework diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index a6f149d093afb..6b601d83c050b 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -94,7 +94,7 @@ jobs: - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO displayName: Install native dependencies - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: # Necessary to install python - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force displayName: Install native dependencies @@ -106,10 +106,10 @@ jobs: displayName: Disk Usage before Build # Build - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter) displayName: Build product - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter) displayName: Build product @@ -131,16 +131,16 @@ jobs: displayName: 'product build' # Build packages - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter) -pack $(OutputRidArg) displayName: Build nupkg - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter) -pack $(OutputRidArg) displayName: Build nupkg # Publish official build - ${{ if eq(parameters.publishToBlobFeed, 'true') }}: - - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci --restore --publish --configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:Configuration=$(_BuildConfig) /p:TargetArchitecture=$(archType) /p:TargetOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)/artifacts/log/publish-pkgs.binlog" --projects $(Build.SourcesDirectory)/eng/empty.csproj displayName: Publish packages to blob feed env: @@ -149,7 +149,7 @@ jobs: ${{ if eq(parameters.osGroup, 'FreeBSD') }}: # Arcade uses this SDK instead of trying to restore one. DotNetCoreSdkDir: /usr/local/dotnet - - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - ${{ if eq(parameters.osGroup, 'windows') }}: # TODO: pass publish feed url and access token in from the internal pipeline - powershell: eng\common\build.ps1 -ci -restore -publish -configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:Configuration=$(_BuildConfig) /p:TargetArchitecture=$(archType) /p:TargetOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)\artifacts\log\publish-pkgs.binlog" -projects $(Build.SourcesDirectory)\eng\empty.csproj displayName: Publish packages to blob feed diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml index 01d12d859f9aa..58366dde638b0 100644 --- a/eng/pipelines/mono/templates/xplat-job.yml +++ b/eng/pipelines/mono/templates/xplat-job.yml @@ -59,8 +59,8 @@ jobs: agentOs: FreeBSD ${{ if in(parameters.osGroup, 'OSX', 'iOS') }}: agentOs: MacOS - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - agentOs: Windows_NT + ${{ if eq(parameters.osGroup, 'windows') }}: + agentOs: windows # Setting this results in the arcade job template including a step # that gathers asset manifests and publishes them to pipeline diff --git a/eng/pipelines/official/stages/publish.yml b/eng/pipelines/official/stages/publish.yml index fc453209702a0..5507dc2b1beb7 100644 --- a/eng/pipelines/official/stages/publish.yml +++ b/eng/pipelines/official/stages/publish.yml @@ -1,5 +1,5 @@ parameters: - PublishRidAgnosticPackagesFromPlatform: Windows_NT_x64 + PublishRidAgnosticPackagesFromPlatform: windows_x64 publishingInfraVersion: 3 stages: diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml index bb51f3c0c7365..b78db5fca3fcc 100644 --- a/eng/pipelines/runtime-linker-tests.yml +++ b/eng/pipelines/runtime-linker-tests.yml @@ -59,7 +59,7 @@ jobs: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: release platforms: - - Windows_NT_x64 + - windows_x64 - OSX_x64 - Linux_x64 jobParameters: diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 80141273f93c0..62c07cbd896b5 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -57,10 +57,10 @@ stages: - Linux_musl_x64 - Linux_musl_arm - Linux_musl_arm64 - - Windows_NT_x86 - - Windows_NT_x64 - - Windows_NT_arm - - Windows_NT_arm64 + - windows_x86 + - windows_x64 + - windows_arm + - windows_arm64 jobParameters: isOfficialBuild: ${{ variables.isOfficialBuild }} @@ -79,9 +79,9 @@ stages: - Linux_musl_x64 - Linux_musl_arm - Linux_musl_arm64 - - Windows_NT_x64 - - Windows_NT_arm - - Windows_NT_arm64 + - windows_x64 + - windows_arm + - windows_arm64 # # Build Mono runtime packs # @@ -109,10 +109,10 @@ stages: - Browser_wasm # - Linux_musl_arm # - Linux_musl_arm64 - # - Windows_NT_x64 enable once coreclr.dll has a version header: https://github.com/dotnet/runtime/issues/37503 - # - Windows_NT_x86 - # - Windows_NT_arm - # - Windows_NT_arm64 + # - windows_x64 enable once coreclr.dll has a version header: https://github.com/dotnet/runtime/issues/37503 + # - windows_x86 + # - windows_arm + # - windows_arm64 jobParameters: buildArgs: -s mono+libs+installer -c $(_BuildConfig) nameSuffix: AllSubsets_Mono @@ -133,10 +133,10 @@ stages: - Linux_arm64 # - Linux_musl_x64 # - Linux_musl_arm64 - # - Windows_NT_x64 - # - Windows_NT_x86 - # - Windows_NT_arm - # - Windows_NT_arm64 + # - windows_x64 + # - windows_x86 + # - windows_arm + # - windows_arm64 jobTemplates: # LLVMJIT - jobTemplate: /eng/pipelines/common/global-build-job.yml @@ -181,10 +181,10 @@ stages: - Linux_musl_x64 - Linux_musl_arm - Linux_musl_arm64 - - Windows_NT_x86 - - Windows_NT_x64 - - Windows_NT_arm - - Windows_NT_arm64 + - windows_x86 + - windows_x64 + - windows_arm + - windows_arm64 jobParameters: isOfficialBuild: ${{ variables.isOfficialBuild }} liveRuntimeBuildConfig: release @@ -197,7 +197,7 @@ stages: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: Release platforms: - - Windows_NT_x64 + - windows_x64 jobParameters: framework: allConfigurations isOfficialBuild: ${{ variables.isOfficialBuild }} @@ -224,10 +224,10 @@ stages: - Linux_musl_x64 - Linux_musl_arm - Linux_musl_arm64 - - Windows_NT_x86 - - Windows_NT_x64 - - Windows_NT_arm - - Windows_NT_arm64 + - windows_x86 + - windows_x64 + - windows_arm + - windows_arm64 - ${{ if eq(variables.isOfficialBuild, true) }}: - template: /eng/pipelines/official/stages/publish.yml diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index e28c814872ba0..dd43cb33606d6 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -144,10 +144,10 @@ jobs: - Linux_musl_arm64 - Linux_musl_x64 - OSX_arm64 - - Windows_NT_x86 - - Windows_NT_x64 - - Windows_NT_arm - - Windows_NT_arm64 + - windows_x86 + - windows_x64 + - windows_arm + - windows_arm64 jobParameters: testGroup: innerloop condition: >- @@ -210,10 +210,10 @@ jobs: - Linux_musl_x64 - Linux_musl_arm - Linux_musl_arm64 - - Windows_NT_x64 - - Windows_NT_x86 - - Windows_NT_arm - - Windows_NT_arm64 + - windows_x64 + - windows_x86 + - windows_arm + - windows_arm64 - FreeBSD_x64 jobParameters: testGroup: innerloop @@ -229,7 +229,7 @@ jobs: platforms: - Linux_x64 # Issue: https://github.com/dotnet/runtime/issues/40034 - #- Windows_NT_x64 + #- windows_x64 jobParameters: condition: >- and( @@ -558,10 +558,10 @@ jobs: - Linux_x64 - Linux_arm64 # - Linux_musl_arm64 - - Windows_NT_x64 - # - Windows_NT_x86 - # - Windows_NT_arm - # - Windows_NT_arm64 + - windows_x64 + # - windows_x86 + # - windows_arm + # - windows_arm64 jobParameters: condition: >- or( @@ -581,10 +581,10 @@ jobs: platforms: - Linux_x64 # - Linux_musl_arm64 - - Windows_NT_x64 - # - Windows_NT_x86 - # - Windows_NT_arm - # - Windows_NT_arm64 + - windows_x64 + # - windows_x86 + # - windows_arm + # - windows_arm64 jobParameters: condition: >- or( @@ -646,9 +646,9 @@ jobs: - Linux_arm - Linux_musl_arm - Linux_musl_arm64 - - Windows_NT_arm - - Windows_NT_arm64 - - Windows_NT_x86 + - windows_arm + - windows_arm64 + - windows_x86 jobParameters: liveRuntimeBuildConfig: release @@ -662,13 +662,13 @@ jobs: - Linux_x64 - OSX_arm64 - OSX_x64 - - Windows_NT_x64 + - windows_x64 - FreeBSD_x64 jobParameters: testScope: innerloop testBuildPlatforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 - OSX_x64 liveRuntimeBuildConfig: release @@ -681,7 +681,7 @@ jobs: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - ${{ if eq(variables['isFullMatrix'], false) }}: - - Windows_NT_x86 + - windows_x86 jobParameters: liveRuntimeBuildConfig: release condition: >- @@ -694,9 +694,9 @@ jobs: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: Release platforms: - - Windows_NT_x86 + - windows_x86 - ${{ if eq(variables['isFullMatrix'], true) }}: - - Windows_NT_x64 + - windows_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isFullMatrix: ${{ variables.isFullMatrix }} @@ -713,7 +713,7 @@ jobs: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - Windows_NT_x64 + - windows_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isFullMatrix: ${{ variables.isFullMatrix }} @@ -736,9 +736,9 @@ jobs: - Linux_arm - Linux_musl_arm - Linux_musl_arm64 - - Windows_NT_x86 - - Windows_NT_arm - - Windows_NT_arm64 + - windows_x86 + - windows_arm + - windows_arm64 jobParameters: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: Release @@ -752,7 +752,7 @@ jobs: - Linux_x64 - Linux_arm64 - Linux_musl_x64 - - Windows_NT_x64 + - windows_x64 - FreeBSD_x64 jobParameters: liveRuntimeBuildConfig: release @@ -806,8 +806,8 @@ jobs: buildConfig: checked platforms: - Linux_arm - - Windows_NT_x86 - - Windows_NT_arm64 + - windows_x86 + - windows_arm64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -827,7 +827,7 @@ jobs: - OSX_x64 - Linux_x64 - Linux_arm64 - - Windows_NT_x64 + - windows_x64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -916,7 +916,7 @@ jobs: runtimeFlavor: mono buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - Windows_NT_x64 + - windows_x64 - OSX_x64 - Linux_arm64 - Linux_x64 @@ -945,7 +945,7 @@ jobs: runtimeFlavor: mono buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - # - Windows_NT_x64 + # - windows_x64 #- OSX_x64 - Linux_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml @@ -973,9 +973,9 @@ jobs: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - - Windows_NT_x86 + - windows_x86 - ${{ if eq(variables['isFullMatrix'], true) }}: - - Windows_NT_arm64 + - windows_arm64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isOfficialBuild: false @@ -998,14 +998,14 @@ jobs: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - Windows_NT_x64 + - windows_x64 - OSX_x64 - Linux_x64 - Linux_musl_x64 - ${{ if eq(variables['isFullMatrix'], true) }}: - Linux_arm64 - ${{ if eq(variables['isFullMatrix'], false) }}: - - Windows_NT_x86 + - windows_x86 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isOfficialBuild: false @@ -1028,11 +1028,11 @@ jobs: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - # - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed. + # - windows_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed. - Linux_arm - Linux_musl_arm - Linux_musl_arm64 - - Windows_NT_x86 + - windows_x86 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: @@ -1050,7 +1050,7 @@ jobs: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - Windows_NT_x64 + - windows_x64 - Linux_x64 - Linux_musl_x64 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml index 9609db224c2c0..38425c1407e93 100644 --- a/eng/pipelines/runtimelab.yml +++ b/eng/pipelines/runtimelab.yml @@ -67,7 +67,7 @@ stages: buildConfig: Checked platforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 jobParameters: timeoutInMinutes: 100 testGroup: innerloop @@ -85,7 +85,7 @@ stages: buildConfig: Release platforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 jobParameters: isOfficialBuild: ${{ variables.isOfficialBuild }} testGroup: innerloop @@ -106,7 +106,7 @@ stages: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: Release platforms: - - Windows_NT_x64 + - windows_x64 jobParameters: isOfficialBuild: ${{ variables.isOfficialBuild }} testGroup: innerloop @@ -131,7 +131,7 @@ stages: dependsOnGlobalBuild: true platforms: - Linux_x64 - - Windows_NT_x64 + - windows_x64 - ${{ if ne(variables.isOfficialBuild, true) }}: # @@ -172,7 +172,7 @@ stages: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: Checked platforms: - - Windows_NT_x64 + - windows_x64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -180,8 +180,8 @@ stages: liveLibrariesBuildConfig: Release dependsOn: - coreclr_common_test_build_p0_AnyOS_AnyCPU_Checked - - build_Windows_NT_x64_Checked_ - - build_Windows_NT_x64_Release_ + - build_windows_x64_Checked_ + - build_windows_x64_Release_ # # Libraries Release Test Execution against a release coreclr runtime @@ -208,7 +208,7 @@ stages: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - - Windows_NT_x64 + - windows_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isFullMatrix: false @@ -218,7 +218,7 @@ stages: dependsOnTestBuildConfiguration: Release dependsOnTestArchitecture: x64 dependsOn: - - build_Windows_NT_x64_Release_ + - build_windows_x64_Release_ - ${{ if eq(variables.isOfficialBuild, true) }}: - template: /eng/pipelines/official/stages/publish.yml diff --git a/eng/targetframeworksuffix.props b/eng/targetframeworksuffix.props index 96cd8db859c37..80443a1646871 100644 --- a/eng/targetframeworksuffix.props +++ b/eng/targetframeworksuffix.props @@ -1,6 +1,6 @@ - + true win diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets index 2fe669a10ba05..be296d75f02bf 100644 --- a/eng/testing/tests.targets +++ b/eng/testing/tests.targets @@ -1,22 +1,22 @@ - RunnerTemplate.cmd - RunnerTemplate.sh + RunnerTemplate.cmd + RunnerTemplate.sh AppleRunnerTemplate.sh AndroidRunnerTemplate.sh WasmRunnerTemplate.sh $(MSBuildThisFileDirectory)$(RunScriptInputName) - RunTests.cmd - RunTests.sh + RunTests.cmd + RunTests.sh $([MSBuild]::NormalizePath('$(OutDir)', '$(RunScriptOutputName)')) - %RUNTIME_PATH%\ - $RUNTIME_PATH/ + %RUNTIME_PATH%\ + $RUNTIME_PATH/ - $(RunScriptHostDir)dotnet.exe - $(RunScriptHostDir)dotnet + $(RunScriptHostDir)dotnet.exe + $(RunScriptHostDir)dotnet @@ -52,8 +52,8 @@ - $(RunScriptCommand) %RSP_FILE% - $(RunScriptCommand) $RSP_FILE + $(RunScriptCommand) %RSP_FILE% + $(RunScriptCommand) $RSP_FILE $([MSBuild]::Escape('$(RunScriptCommand)')) @@ -86,7 +86,7 @@ TemplatePath="$(RunScriptInputPath)" OutputPath="$(RunScriptOutputPath)" /> - + diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd index 730e8d0f94fa2..ca32712554db5 100644 --- a/src/coreclr/build-runtime.cmd +++ b/src/coreclr/build-runtime.cmd @@ -26,7 +26,7 @@ if defined VS160COMNTOOLS ( :: Note that the msbuild project files (specifically, dir.proj) will use the following variables, if set: :: __BuildArch -- default: x64 :: __BuildType -- default: Debug -:: __TargetOS -- default: Windows_NT +:: __TargetOS -- default: windows :: __ProjectDir -- default: directory of the dir.props file :: __RepoRootDir -- default: directory two levels above the dir.props file :: __SourceDir -- default: %__ProjectDir%\src\ @@ -40,7 +40,7 @@ if defined VS160COMNTOOLS ( :: Set the default arguments for build set __BuildArch=x64 set __BuildType=Debug -set __TargetOS=Windows_NT +set __TargetOS=windows :: Set the various build properties here so that CMake and MSBuild can pick them up set "__ProjectDir=%~dp0" diff --git a/src/coreclr/crossgen-corelib.cmd b/src/coreclr/crossgen-corelib.cmd index c153745ea91c3..14a018ae88a48 100644 --- a/src/coreclr/crossgen-corelib.cmd +++ b/src/coreclr/crossgen-corelib.cmd @@ -13,7 +13,7 @@ set __ThisScriptDir=%~dp0 :: Note that the msbuild project files (specifically, dir.proj) will use the following variables, if set: :: __BuildArch -- default: x64 :: __BuildType -- default: Debug -:: __TargetOS -- default: Windows_NT +:: __TargetOS -- default: windows :: __ProjectDir -- default: directory of the dir.props file :: __RepoRootDir -- default: directory two levels above the dir.props file :: __RootBinDir -- default: %__RepoRootDir%\artifacts\ @@ -26,7 +26,7 @@ set __ThisScriptDir=%~dp0 :: Set the default arguments for build set __BuildArch=x64 set __BuildType=Debug -set __TargetOS=Windows_NT +set __TargetOS=windows set "__ProjectDir=%~dp0" :: remove trailing slash diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props index b4494a50ac170..ebaf9645134ab 100644 --- a/src/coreclr/dir.common.props +++ b/src/coreclr/dir.common.props @@ -58,7 +58,7 @@ true true true - true + true true diff --git a/src/coreclr/scripts/coreclr_arguments.py b/src/coreclr/scripts/coreclr_arguments.py index 441c447903021..aab997306f190 100644 --- a/src/coreclr/scripts/coreclr_arguments.py +++ b/src/coreclr/scripts/coreclr_arguments.py @@ -65,7 +65,7 @@ def __init__(self, self.valid_arches = ["x64", "x86", "arm", "arm64", "wasm"] self.valid_build_types = ["Debug", "Checked", "Release"] - self.valid_host_os = ["Windows_NT", "OSX", "Linux", "illumos", "Solaris", "Browser", "Android"] + self.valid_host_os = ["windows", "OSX", "Linux", "illumos", "Solaris", "Browser", "Android"] self.__initialize__(args) @@ -175,7 +175,7 @@ def verify(self, def provide_default_host_os(): """ Return a string representing the current host operating system. - Returns one of: Linux, OSX, Windows_NT, illumos, Solaris + Returns one of: Linux, OSX, windows, illumos, Solaris """ if sys.platform == "linux" or sys.platform == "linux2": @@ -183,7 +183,7 @@ def provide_default_host_os(): elif sys.platform == "darwin": return "OSX" elif sys.platform == "win32": - return "Windows_NT" + return "windows" elif sys.platform.startswith("sunos"): is_illumos = ('illumos' in subprocess.Popen(["uname", "-o"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode('utf-8')) return 'illumos' if is_illumos else 'Solaris' diff --git a/src/coreclr/scripts/jitrollingbuild.py b/src/coreclr/scripts/jitrollingbuild.py index d947c7a5d2fdd..83434438dac10 100644 --- a/src/coreclr/scripts/jitrollingbuild.py +++ b/src/coreclr/scripts/jitrollingbuild.py @@ -57,7 +57,7 @@ List clrjit in SuperPMI Azure storage. """ -host_os_help = "OS (Windows_NT, OSX, Linux). Default: current OS." +host_os_help = "OS (windows, OSX, Linux). Default: current OS." arch_help = "Architecture (x64, x86, arm, arm64). Default: current architecture." @@ -166,7 +166,7 @@ def determine_jit_name(coreclr_args): return "lib" + jit_base_name + ".dylib" elif coreclr_args.host_os == "Linux": return "lib" + jit_base_name + ".so" - elif coreclr_args.host_os == "Windows_NT": + elif coreclr_args.host_os == "windows": return jit_base_name + ".dll" else: raise RuntimeError("Unknown OS.") @@ -299,7 +299,7 @@ def upload_blob(file, blob_name): elif coreclr_args.host_os == "Linux": allowed_extensions = [ ".so" ] # Add .dbg for debug info - elif coreclr_args.host_os == "Windows_NT": + elif coreclr_args.host_os == "windows": allowed_extensions = [ ".dll" ] else: raise RuntimeError("Unknown OS.") @@ -310,7 +310,7 @@ def upload_blob(file, blob_name): files += cross_jit_paths # On Windows, grab the PDB files from a sub-directory. - # if coreclr_args.host_os == "Windows_NT": + # if coreclr_args.host_os == "windows": # pdb_dir = os.path.join(coreclr_args.product_location, "PDB") # if os.path.isdir(pdb_dir): # pdb_paths = [os.path.join(pdb_dir, item) for item in os.listdir(pdb_dir) if re.match(r'.*clrjit.*', item)] diff --git a/src/coreclr/scripts/superpmi-setup.py b/src/coreclr/scripts/superpmi-setup.py index 48e72d5de774c..d119fba7ee2aa 100644 --- a/src/coreclr/scripts/superpmi-setup.py +++ b/src/coreclr/scripts/superpmi-setup.py @@ -23,7 +23,7 @@ # 4. Lastly, it sets the pipeline variables. # Below are the helix queues it sets depending on the OS/architecture: -# | Arch | Windows_NT | Linux | +# | Arch | windows | Linux | # |-------|------------------|--------------------------------------------------------------------------------------------------------------------------------------| # | x86 | Windows.10.Amd64 | - | # | x64 | Windows.10.Amd64 | Ubuntu.1804.Amd64 | diff --git a/src/coreclr/scripts/superpmi.md b/src/coreclr/scripts/superpmi.md index a72ee2f06a95c..5e80f70f663b8 100644 --- a/src/coreclr/scripts/superpmi.md +++ b/src/coreclr/scripts/superpmi.md @@ -58,7 +58,7 @@ If you want to use a specific MCH file collection, use the `-mch_files` argument one or more MCH files on your machine: ``` -python f:\gh\runtime\src\coreclr\scripts\superpmi.py replay -mch_files f:\spmi\collections\tests.pmi.Windows_NT.x64.Release.mch +python f:\gh\runtime\src\coreclr\scripts\superpmi.py replay -mch_files f:\spmi\collections\tests.pmi.windows.x64.Release.mch ``` The `-mch_files` argument takes a list of one or more directories or files to use. For diff --git a/src/coreclr/scripts/superpmi.proj b/src/coreclr/scripts/superpmi.proj index 7524245f4c71f..c7facc7bb5d72 100644 --- a/src/coreclr/scripts/superpmi.proj +++ b/src/coreclr/scripts/superpmi.proj @@ -1,9 +1,9 @@ - + \ - + / @@ -16,7 +16,7 @@ PmiAssembliesPayload - Path that will be sent to helix machine to run collection on PmiAssembliesDirectory - Path on helix machine itself where superpmi.py will discover the sent assemblies. --> - + %HELIX_PYTHONPATH% $(WorkItemDirectory)\pmiAssembliesDirectory %HELIX_WORKITEM_PAYLOAD%\binaries @@ -26,7 +26,7 @@ $(BUILD_SOURCESDIRECTORY)\artifacts\helixresults $(SuperPMIDirectory)\superpmi.py collect --pmi -pmi_location $(SuperPMIDirectory)\pmi.dll - + $HELIX_PYTHONPATH $(WorkItemDirectory)/pmiAssembliesDirectory $HELIX_WORKITEM_PAYLOAD/binaries diff --git a/src/coreclr/scripts/superpmi.py b/src/coreclr/scripts/superpmi.py index 85bdcb974c9aa..150880a9a89fd 100755 --- a/src/coreclr/scripts/superpmi.py +++ b/src/coreclr/scripts/superpmi.py @@ -114,7 +114,7 @@ to get that version. Otherwise, use "unknown-jit-ee-version". """ -host_os_help = "OS (Windows_NT, OSX, Linux). Default: current OS." +host_os_help = "OS (windows, OSX, Linux). Default: current OS." arch_help = "Architecture (x64, x86, arm, arm64). Default: current architecture." @@ -625,7 +625,7 @@ def __init__(self, coreclr_args): elif coreclr_args.host_os == "Linux": self.collection_shim_name = "libsuperpmi-shim-collector.so" self.corerun_tool_name = "corerun" - elif coreclr_args.host_os == "Windows_NT": + elif coreclr_args.host_os == "windows": self.collection_shim_name = "superpmi-shim-collector.dll" self.corerun_tool_name = "corerun.exe" else: @@ -975,7 +975,7 @@ def print_superpmi_failure_code(return_code, coreclr_args): logging.warning("Compilation failures") elif return_code == 2: logging.warning("Asm diffs found") - elif return_code == 139 and coreclr_args.host_os != "Windows_NT": + elif return_code == 139 and coreclr_args.host_os != "windows": logging.error("Fatal error, SuperPMI has returned SIGSEGV (segmentation fault)") else: logging.error("Unknown error code %s", return_code) @@ -1621,7 +1621,7 @@ def determine_coredis_tools(coreclr_args): coredistools_dll_name = "libcoredistools.dylib" elif coreclr_args.host_os.lower() == "linux": coredistools_dll_name = "libcoredistools.so" - elif coreclr_args.host_os.lower() == "windows_nt": + elif coreclr_args.host_os.lower() == "windows": coredistools_dll_name = "coredistools.dll" else: raise RuntimeError("Unknown host os: {}".format(coreclr_args.host_os)) @@ -1703,7 +1703,7 @@ def determine_jit_name(coreclr_args): return "lib" + jit_base_name + ".dylib" elif coreclr_args.host_os == "Linux": return "lib" + jit_base_name + ".so" - elif coreclr_args.host_os == "Windows_NT": + elif coreclr_args.host_os == "windows": return jit_base_name + ".dll" else: raise RuntimeError("Unknown OS.") @@ -1762,7 +1762,7 @@ def determine_superpmi_tool_name(coreclr_args): if coreclr_args.host_os == "OSX" or coreclr_args.host_os == "Linux": return "superpmi" - elif coreclr_args.host_os == "Windows_NT": + elif coreclr_args.host_os == "windows": return "superpmi.exe" else: raise RuntimeError("Unknown OS.") @@ -1794,7 +1794,7 @@ def determine_mcs_tool_name(coreclr_args): if coreclr_args.host_os == "OSX" or coreclr_args.host_os == "Linux": return "mcs" - elif coreclr_args.host_os == "Windows_NT": + elif coreclr_args.host_os == "windows": return "mcs.exe" else: raise RuntimeError("Unsupported OS.") @@ -1883,7 +1883,7 @@ def print_platform_specific_environment_vars(loglevel, coreclr_args, var, value) value (str): value being set. """ - if coreclr_args.host_os == "Windows_NT": + if coreclr_args.host_os == "windows": logging.log(loglevel, "set %s=%s", var, value) else: logging.log(loglevel, "export %s=%s", var, value) @@ -1975,7 +1975,7 @@ def process_mch_files_arg(coreclr_args): for item in coreclr_args.mch_files: # On Windows only, see if any of the mch_files are UNC paths (i.e., "\\server\share\..."). # If so, download and cache all the files found there to our usual local cache location, to avoid future network access. - if coreclr_args.host_os == "Windows_NT" and item.startswith("\\\\"): + if coreclr_args.host_os == "windows" and item.startswith("\\\\"): # Special case: if the user specifies a .mch file, we'll also look for and cache a .mch.mct file next to it, if one exists. # This happens naturally if a directory is passed and we search for all .mch and .mct files in that directory. mch_file = os.path.abspath(item) @@ -2293,8 +2293,8 @@ def list_collections_local_command(coreclr_args): default_mch_dir = os.path.join(default_mch_root_dir, "{}.{}.{}".format(coreclr_args.jit_ee_version, coreclr_args.host_os, coreclr_args.arch)) # Determine if a file should be allowed. The filenames look like: - # c:\gh\runtime\artifacts\spmi\mch\a5eec3a4-4176-43a7-8c2b-a05b551d4f49.Windows_NT.x64\corelib.Windows_NT.x64.Checked.mch - # c:\gh\runtime\artifacts\spmi\mch\a5eec3a4-4176-43a7-8c2b-a05b551d4f49.Windows_NT.x64\corelib.Windows_NT.x64.Checked.mch.mct + # c:\gh\runtime\artifacts\spmi\mch\a5eec3a4-4176-43a7-8c2b-a05b551d4f49.windows.x64\corelib.windows.x64.Checked.mch + # c:\gh\runtime\artifacts\spmi\mch\a5eec3a4-4176-43a7-8c2b-a05b551d4f49.windows.x64\corelib.windows.x64.Checked.mch.mct # Only include MCH files, not clrjit.dll or MCT (TOC) files. def filter_superpmi_collections(path: str): return path.lower().endswith(".mch") @@ -2788,18 +2788,18 @@ def verify_replay_common_args(): determined_arch = None determined_build_type = None if jit_in_product_location: - # Get os/arch/flavor directory, e.g. split "F:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked" with "F:\gh\runtime\artifacts\bin\coreclr" + # Get os/arch/flavor directory, e.g. split "F:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked" with "F:\gh\runtime\artifacts\bin\coreclr" # yielding # [0]: "" - # [1]: "\Windows_NT.x64.Checked" + # [1]: "\windows.x64.Checked" standard_location_split = os.path.dirname(coreclr_args.jit_path).split(os.path.dirname(coreclr_args.product_location)) assert coreclr_args.host_os in standard_location_split[1] # Get arch/flavor. Remove leading slash. specialized_path = standard_location_split[1].split(os.path.sep)[1] - # Split components: "Windows_NT.x64.Checked" into: - # [0]: "Windows_NT" + # Split components: "windows.x64.Checked" into: + # [0]: "windows" # [1]: "x64" # [2]: "Checked" determined_split = specialized_path.split(".") @@ -2894,18 +2894,18 @@ def verify_replay_common_args(): determined_arch = None determined_build_type = None if jit_in_product_location: - # Get os/arch/flavor directory, e.g. split "F:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked" with "F:\gh\runtime\artifacts\bin\coreclr" + # Get os/arch/flavor directory, e.g. split "F:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked" with "F:\gh\runtime\artifacts\bin\coreclr" # yielding # [0]: "" - # [1]: "\Windows_NT.x64.Checked" + # [1]: "\windows.x64.Checked" standard_location_split = os.path.dirname(coreclr_args.base_jit_path).split(os.path.dirname(coreclr_args.product_location)) assert coreclr_args.host_os in standard_location_split[1] # Get arch/flavor. Remove leading slash. specialized_path = standard_location_split[1].split(os.path.sep)[1] - # Split components: "Windows_NT.x64.Checked" into: - # [0]: "Windows_NT" + # Split components: "windows.x64.Checked" into: + # [0]: "windows" # [1]: "x64" # [2]: "Checked" determined_split = specialized_path.split(".") diff --git a/src/coreclr/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props index e44f8de0a11c6..3473cbf83b521 100644 --- a/src/coreclr/src/.nuget/Directory.Build.props +++ b/src/coreclr/src/.nuget/Directory.Build.props @@ -33,7 +33,7 @@ $(OSRid) - Windows_NT;OSX;Android;Linux;FreeBSD;NetBSD;illumos;Solaris + windows;OSX;Android;Linux;FreeBSD;NetBSD;illumos;Solaris ;$(SupportedPackageOSGroups); diff --git a/src/coreclr/src/ToolBox/superpmi/readme.md b/src/coreclr/src/ToolBox/superpmi/readme.md index 7b6be5693b930..e5e64514dd209 100644 --- a/src/coreclr/src/ToolBox/superpmi/readme.md +++ b/src/coreclr/src/ToolBox/superpmi/readme.md @@ -78,7 +78,7 @@ To manually do a collection (not using the `superpmi.py` script or First, build the `dotnet/runtime` repo, which builds the `superpmi`, `mcs`, and `superpmi-shim-collector` programs, along with the rest of coreclr, and places them in the same native code directory as the JIT and the rest -of coreclr, e.g., `f:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked\superpmi.exe` +of coreclr, e.g., `f:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked\superpmi.exe` for a `dotnet/runtime` repo rooted at the `f:\gh\runtime` directory, and built on Windows for the x64 Checked architecture / build flavor combination. @@ -131,7 +131,7 @@ for example, on Windows: ``` mkdir f:\spmi\temp set SuperPMIShimLogPath=f:\spmi\temp -set SuperPMIShimPath=f:\gh\runtime\artifacts\tests\coreclr\Windows_NT.x64.Checked\Tests\Core_Root\clrjit.dll +set SuperPMIShimPath=f:\gh\runtime\artifacts\tests\coreclr\windows.x64.Checked\Tests\Core_Root\clrjit.dll set COMPlus_AltJit=* set COMPlus_AltJitNgen=* set COMPlus_AltJitName=superpmi-shim-collector.dll @@ -181,7 +181,7 @@ the initial collection). So, for the example above, you might use: ``` -f:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked\mcs.exe -merge f:\spmi\base.mch f:\spmi\temp\*.mc -recursive -dedup -thin +f:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked\mcs.exe -merge f:\spmi\base.mch f:\spmi\temp\*.mc -recursive -dedup -thin ``` Note that `mcs -merge` without `-dedup -thin` is literally just a file concatenation @@ -210,7 +210,7 @@ the ways in which we normally use SuperPMI. For the continuing example, you might use: ``` -f:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked\mcs.exe -removeDup -thin f:\spmi\base.mch f:\spmi\unique.mch +f:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked\mcs.exe -removeDup -thin f:\spmi\base.mch f:\spmi\unique.mch ``` After this step, you can remove the base.mch file (unless you want to debug @@ -234,8 +234,8 @@ mcs.exe -strip basefail.mcl unique.mch final.mch Or, continuing the example above, giving full paths, we have: ``` -f:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked\superpmi.exe -p -f f:\spmi\basefail.mcl f:\spmi\unique.mch f:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked\clrjit.dll -f:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked\mcs.exe -strip f:\spmi\basefail.mcl f:\spmi\unique.mch f:\spmi\final.mch +f:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked\superpmi.exe -p -f f:\spmi\basefail.mcl f:\spmi\unique.mch f:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked\clrjit.dll +f:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked\mcs.exe -strip f:\spmi\basefail.mcl f:\spmi\unique.mch f:\spmi\final.mch ``` @@ -250,7 +250,7 @@ mcs -toc final.mch or, using the full paths from above: ``` -f:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked\mcs.exe -toc f:\spmi\final.mch +f:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked\mcs.exe -toc f:\spmi\final.mch ``` @@ -265,7 +265,7 @@ superpmi -p -f finalfail.mcl final.mch clrjit.dll Or, continuing the example above, giving full paths, we have: ``` -f:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked\superpmi.exe -p -f f:\spmi\finalfail.mcl f:\spmi\final.mch f:\gh\runtime\artifacts\bin\coreclr\Windows_NT.x64.Checked\clrjit.dll +f:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked\superpmi.exe -p -f f:\spmi\finalfail.mcl f:\spmi\final.mch f:\gh\runtime\artifacts\bin\coreclr\windows.x64.Checked\clrjit.dll ``` In this case, if `finalfail.mcl` is not empty, there was a failure in the final "check" replay. diff --git a/src/coreclr/src/inc/readme.md b/src/coreclr/src/inc/readme.md index e8f3405859e0f..ee47be8e514ed 100644 --- a/src/coreclr/src/inc/readme.md +++ b/src/coreclr/src/inc/readme.md @@ -4,9 +4,9 @@ This directory has a variety of .idl files (such as corprof.idl) that need a lit the build rules would automatically convert the idls into corresponding .h/.c files and include them in compilations. On non-windows platforms we don't have an equivalent for midl.exe which did that conversion so we work around the issue by doing: -- Build on Windows as normal, which will generate files in artifacts\obj\Windows_NT.x64.Debug\src\inc\idls_out\ +- Build on Windows as normal, which will generate files in artifacts\obj\windows.x64.Debug\src\inc\idls_out\ - Copy any updated headers into src\pal\prebuilt\inc\ -- If needed, adjust any of the .cpp files in src\pal\prebuilt\idl\ by hand, using the corresponding artifacts\obj\Windows_NT.x64.Debug\src\inc\idls_out\*_i.c as a guide. Typically +- If needed, adjust any of the .cpp files in src\pal\prebuilt\idl\ by hand, using the corresponding artifacts\obj\windows.x64.Debug\src\inc\idls_out\*_i.c as a guide. Typically this is just adding MIDL_DEFINE_GUID(...) for any new classes/interfaces that have been added to the idl file. Include these src changes with the remainder of your work when you submit a PR. diff --git a/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj index 2d41acad35a5a..ad11c3afa8167 100644 --- a/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj +++ b/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj @@ -59,7 +59,7 @@ x64 unix - win + win $(TargetOSComponent)_$(TargetArchitecture)_$(TargetArchitecture) $(TargetOSComponent)_$(TargetArchitecture)_$(CrossHostArch) @@ -88,7 +88,7 @@ - + .a - .lib + .lib diff --git a/src/coreclr/src/vm/.vscode/c_cpp_properties.json b/src/coreclr/src/vm/.vscode/c_cpp_properties.json index 86adb9feee344..6cf89552d9d2c 100644 --- a/src/coreclr/src/vm/.vscode/c_cpp_properties.json +++ b/src/coreclr/src/vm/.vscode/c_cpp_properties.json @@ -3,7 +3,7 @@ { "name": "Win32-Debug", "includePath": [ - "../../../../artifacts/obj/coreclr/Windows_NT.x64.Debug/src/vm/dac", + "../../../../artifacts/obj/coreclr/windows.x64.Debug/src/vm/dac", "../../src/vm/dac", "../../src/vm", "../../src/pal/prebuilt/inc", @@ -16,8 +16,8 @@ "../../src/md/inc", "../../src/classlibnative/bcltype", "../../src/classlibnative/inc", - "../../../../artifacts/obj/coreclr/Windows_NT.x64.Debug/src/inc", - "../../../../artifacts/obj/coreclr/Windows_NT.x64.Debug/src/inc/etw", + "../../../../artifacts/obj/coreclr/windows.x64.Debug/src/inc", + "../../../../artifacts/obj/coreclr/windows.x64.Debug/src/inc/etw", "../../src/vm/amd64" ], "defines": [ diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props index 5d7e74fb27a49..319906aef6544 100644 --- a/src/installer/Directory.Build.props +++ b/src/installer/Directory.Build.props @@ -58,7 +58,7 @@ - .exe + .exe @@ -67,7 +67,7 @@ - win-$(TargetArchitecture) + win-$(TargetArchitecture) osx-$(TargetArchitecture) linux-$(TargetArchitecture) freebsd-$(TargetArchitecture) @@ -305,14 +305,14 @@ - .zip - .tar.gz - .msi + .zip + .tar.gz + .msi .pkg .deb .rpm - .exe - $(InstallerExtension) + .exe + $(InstallerExtension) @@ -331,18 +331,18 @@ - lib + lib .so - .dll + .dll .dylib lib .a - .lib + .lib .map - .ni.pdb + .ni.pdb diff --git a/src/installer/corehost/cli/apphost/static/CMakeLists.txt b/src/installer/corehost/cli/apphost/static/CMakeLists.txt index e1275f3289d46..3e9c4bf2bfe8c 100644 --- a/src/installer/corehost/cli/apphost/static/CMakeLists.txt +++ b/src/installer/corehost/cli/apphost/static/CMakeLists.txt @@ -106,7 +106,7 @@ if (CLR_CMAKE_TARGET_WIN32 AND (CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_AR target_link_libraries(singlefilehost Advapi32.lib shell32.lib) endif() -# Path like: artifacts/bin/coreclr/Windows_NT.x64.Release/lib or +# Path like: artifacts/bin/coreclr/windows.x64.Release/lib or # /root/runtime/artifacts/transport/coreclr/lib set(CORECLR_STATIC_LIB_LOCATION "${CORECLR_ARTIFACTS}/lib") diff --git a/src/installer/corehost/corehost.proj b/src/installer/corehost/corehost.proj index d2f49622c3e74..43346190a8435 100644 --- a/src/installer/corehost/corehost.proj +++ b/src/installer/corehost/corehost.proj @@ -23,7 +23,7 @@ BuildCoreHostWindows" /> $(IntermediateOutputRootPath)corehost\cmake\ @@ -50,7 +50,7 @@ @@ -108,7 +108,7 @@ #include <Windows.h> diff --git a/src/installer/pkg/packaging/installers.proj b/src/installer/pkg/packaging/installers.proj index dbae53d0852e0..a3494e48efaed 100644 --- a/src/installer/pkg/packaging/installers.proj +++ b/src/installer/pkg/packaging/installers.proj @@ -32,7 +32,7 @@ - + - + - + - + @@ -137,22 +137,22 @@ - + - - - - @@ -195,7 +195,7 @@ + Condition="'$(TargetOS)'=='windows'"> + Condition="'$(TargetOS)'!='windows'"> diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props index abf841cbd26e7..3f6f90f8cf47a 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props @@ -10,7 +10,7 @@ - + diff --git a/src/installer/pkg/projects/netcoreapp/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/Directory.Build.props index 63ce1c404aba0..36885e8e8b63f 100644 --- a/src/installer/pkg/projects/netcoreapp/Directory.Build.props +++ b/src/installer/pkg/projects/netcoreapp/Directory.Build.props @@ -6,7 +6,7 @@ Installer uses Unix when applicable, but others go straight to Linux. --> - Windows_NT + windows Linux OSX iOS diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj index 84db7659fd679..32a1ce3ac47d7 100644 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj +++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj @@ -44,7 +44,7 @@ unix - win + win diff --git a/src/installer/signing/Directory.Build.targets b/src/installer/signing/Directory.Build.targets index 91473940ef2c2..7d95c6c7b7f9d 100644 --- a/src/installer/signing/Directory.Build.targets +++ b/src/installer/signing/Directory.Build.targets @@ -47,7 +47,7 @@ diff --git a/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj b/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj index 95b8cfd9a9f6e..55c14ce9d5a6b 100644 --- a/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj +++ b/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj @@ -5,7 +5,7 @@ HostActivation.Tests HostActivation.Tests true - $(DefineConstants);WINDOWS + $(DefineConstants);WINDOWS ha true diff --git a/src/libraries/Common/src/System/Security/Cryptography/Asn1/AsnXml.targets b/src/libraries/Common/src/System/Security/Cryptography/Asn1/AsnXml.targets index 071432c841e84..5190f7be8f837 100644 --- a/src/libraries/Common/src/System/Security/Cryptography/Asn1/AsnXml.targets +++ b/src/libraries/Common/src/System/Security/Cryptography/Asn1/AsnXml.targets @@ -21,7 +21,7 @@ XmlInputPaths="@(AsnXml)" OutputPaths="@(AsnXml -> '$(IntermediateOutputPath)asnxml\%(filename).cs')" /> - @@ -29,7 +29,7 @@ - + <_AsnXmlDiffCode Include="1" /> diff --git a/src/libraries/Common/tests/Common.Tests.csproj b/src/libraries/Common/tests/Common.Tests.csproj index 12e815eb4a553..9dd6f6fe48cda 100644 --- a/src/libraries/Common/tests/Common.Tests.csproj +++ b/src/libraries/Common/tests/Common.Tests.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX annotations diff --git a/src/libraries/Common/tests/StaticTestGenerator/Program.cs b/src/libraries/Common/tests/StaticTestGenerator/Program.cs index 2ad4fd66d5924..1c25d5ccd4cdd 100644 --- a/src/libraries/Common/tests/StaticTestGenerator/Program.cs +++ b/src/libraries/Common/tests/StaticTestGenerator/Program.cs @@ -273,7 +273,7 @@ from part in line.Split(' ') // Invalid command line arguments. Console.WriteLine("Usage: "); Console.WriteLine(" Example:"); - Console.WriteLine(@" dotnet run d:\tmpoutput d:\repos\runtime\artifacts\bin\testhost\net6.0-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\6.0.0\ d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net6.0-Windows_NT-Debug\System.Runtime.Tests.dll"); + Console.WriteLine(@" dotnet run d:\tmpoutput d:\repos\runtime\artifacts\bin\testhost\net6.0-windows-Debug-x64\shared\Microsoft.NETCore.App\6.0.0\ d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net6.0-windows-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 73a82c4d4258d..141f3602edfbb 100644 --- a/src/libraries/Common/tests/StaticTestGenerator/README.md +++ b/src/libraries/Common/tests/StaticTestGenerator/README.md @@ -22,16 +22,16 @@ From within the utility directory, run the utility with the arguments: For example: ``` -dotnet run d:\output "d:\repos\runtime\artifacts\bin\testhost\net5.0-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\5.0.0" "d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net5.0-Windows_NT-Debug\System.Runtime.Tests.dll" +dotnet run d:\output "d:\repos\runtime\artifacts\bin\testhost\net5.0-windows-Debug-x64\shared\Microsoft.NETCore.App\5.0.0" "d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net5.0-windows-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\runtime\artifacts\bin\System.Runtime.Tests\net5.0-Windows_NT-Debug\System.Runtime.Tests.dll -3/27/2019 10:55:37 PM | Helper assemblies path: d:\repos\runtime\artifacts\bin\testhost\net5.0-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\3.0.0\ +3/27/2019 10:55:37 PM | Test assembly path : d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net5.0-windows-Debug\System.Runtime.Tests.dll +3/27/2019 10:55:37 PM | Helper assemblies path: d:\repos\runtime\artifacts\bin\testhost\net5.0-windows-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\runtime\artifacts\bin\System.Runtime.Tests\net5.0-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 | Xunit arguments : d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net5.0-windows-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 | -3/27/2019 10:55:37 PM | Loaded System.Runtime.Tests from d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net5.0-Windows_NT-Debug\System.Runtime.Tests.dll +3/27/2019 10:55:37 PM | Loaded System.Runtime.Tests from d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net5.0-windows-Debug\System.Runtime.Tests.dll 3/27/2019 10:55:37 PM | Found 5322 test methods. 3/27/2019 10:55:38 PM | Found 3469 InlineDatas / 949 MethodDatas across 5322 test methods. 3/27/2019 10:55:38 PM | diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 7622c28efd0e0..9e05e6870a2b9 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -99,7 +99,7 @@ <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex))) <_portableOS>linux <_portableOS Condition="'$(RuntimeOS)' == 'linux-musl'">linux-musl - <_portableOS Condition="'$(_runtimeOSFamily)' == 'win' or '$(TargetOS)' == 'Windows_NT'">win + <_portableOS Condition="'$(_runtimeOSFamily)' == 'win' or '$(TargetOS)' == 'windows'">win <_portableOS Condition="'$(_runtimeOSFamily)' == 'osx'">osx <_portableOS Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">freebsd <_portableOS Condition="'$(_runtimeOSFamily)' == 'illumos'">illumos @@ -120,14 +120,14 @@ <_buildingInOSX>$([MSBuild]::IsOSPlatform('OSX')) - win-x64 - osx-x64 - linux-x64 + win-x64 + osx-x64 + linux-x64 - win-x64 - osx-x64 - linux-x64 + win-x64 + osx-x64 + linux-x64 osx-x64 diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj index 5aadca703ef16..1a5bbb93ca99f 100644 --- a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj +++ b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) enable $(NoWarn);nullable diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj index efc623ec5a244..4d2866dda980d 100644 --- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj +++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj @@ -2,7 +2,7 @@ Microsoft.Diagnostics.Tracing.EventSource $(DefineConstants);NO_EVENTCOMMANDEXECUTED_SUPPORT;ES_BUILD_STANDALONE;FEATURE_MANAGED_ETW;TARGET_WINDOWS - net461-Windows_NT + net461-windows enable $(OutputPath)$(AssemblyName).xml true 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 b2043931b9a6b..46457b709cc37 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 @@ -2,7 +2,7 @@ $(DefineConstants);USE_MDT_EVENTSOURCE true - net461-Windows_NT + net461-windows ..\..\System.Diagnostics.Tracing\tests diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj index b5365cdda8447..8038a16a4d5af 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net461 true diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj index 83ceb2b247352..58364d61b28e4 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net461 true diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj index 4a43d5cc11404..0243aff0faea1 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj +++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj @@ -17,7 +17,7 @@ Microsoft.VisualBasic.Core false - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT + $(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows diff --git a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj index e266af65df134..5b8b97b8c98ef 100644 --- a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj +++ b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj b/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj index fd58739e8f12b..aa61641a9fa94 100644 --- a/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj +++ b/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj index f93606b6a9602..6ce1218ec14c4 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj @@ -1,7 +1,7 @@ true - netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT + netstandard2.0-windows;netstandard2.0;net461-windows enable diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj index c7ded4394f355..1752e89bc52e6 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;net461-windows diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index ab962d316335a..845a6e4ab2f5e 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -2,7 +2,7 @@ true $(DefineConstants);REGISTRY_ASSEMBLY - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows true $(NoWarn);CA2249 enable diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj index 36f086dad5527..bfe24efad0153 100644 --- a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj +++ b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj @@ -1,7 +1,7 @@ $(DefineConstants);REGISTRY_ASSEMBLY - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;net461-windows true enable - $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netcoreapp3.0-Windows_NT;net461 + $(NetCoreAppCurrent)-windows;netstandard2.0;netcoreapp2.0-windows;netcoreapp3.0-windows;net461 true diff --git a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj index dd47716522243..c8efc5731d0d2 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;net461-windows $(MSBuildThisFileDirectory)..\pkg\build\dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json "$(DotNetTool)" - set DOTNET_MULTILEVEL_LOOKUP=0 & $(GeneratorCommand) - export DOTNET_MULTILEVEL_LOOKUP=0 && $(GeneratorCommand) + set DOTNET_MULTILEVEL_LOOKUP=0 & $(GeneratorCommand) + export DOTNET_MULTILEVEL_LOOKUP=0 && $(GeneratorCommand) diff --git a/src/libraries/Native/build-native.cmd b/src/libraries/Native/build-native.cmd index 8ada3872c6f3d..e96af68eb5a18 100644 --- a/src/libraries/Native/build-native.cmd +++ b/src/libraries/Native/build-native.cmd @@ -12,7 +12,7 @@ set __IntermediatesDir="" set __BuildArch=x64 set __BuildTarget="build" set __VCBuildArch=x86_amd64 -set __TargetOS=Windows_NT +set __TargetOS=windows set CMAKE_BUILD_TYPE=Debug set "__LinkArgs= " set "__LinkLibraries= " diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj index 17ad64168787c..900d7f0ad7262 100644 --- a/src/libraries/Native/build-native.proj +++ b/src/libraries/Native/build-native.proj @@ -1,8 +1,8 @@ - $(ArtifactsObjDir)_version.h - $(ArtifactsObjDir)_version.c + $(ArtifactsObjDir)_version.h + $(ArtifactsObjDir)_version.c $(BuildTargetFramework) $(NetCoreAppCurrent) <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(TargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS) diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj index 555d37eb2cb37..f6f45fd83fe63 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj @@ -4,7 +4,7 @@ true true true - $(NetCoreAppCurrent)-Windows_NT;net461 + $(NetCoreAppCurrent)-windows;net461 true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj index d8ea79330084f..082f61922fe0c 100644 --- a/src/libraries/System.Console/tests/System.Console.Tests.csproj +++ b/src/libraries/System.Console/tests/System.Console.Tests.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT + $(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj index 9286d2cfebd22..87ad725689c71 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp2.0-FreeBSD;netcoreapp2.0-Linux;netcoreapp2.0-OSX;netcoreapp2.0-Windows_NT;netstandard2.0;net461-Windows_NT + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp2.0-FreeBSD;netcoreapp2.0-Linux;netcoreapp2.0-OSX;netcoreapp2.0-windows;netstandard2.0;net461-windows true $(NoWarn);CA2249;CA1838 enable 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 208f6a4ab831b..d22d70ea780ba 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 @@ -1,7 +1,7 @@ $(DefineConstants);TargetsWindows - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net461-Windows_NT + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net461-windows diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj index 982531b5b9577..16505436d47f1 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -1,7 +1,7 @@ true - netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT + netstandard2.0-windows;netstandard2.0;net461-windows true enable diff --git a/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj b/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj index d4874a8727ff3..35d80cbf9f22e 100644 --- a/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj +++ b/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;net461-windows 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 96893aa3faa27..6e8c0ad320d51 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 @@ -3,7 +3,7 @@ System.Diagnostics.Tests true None - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix true 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 8cc016a37866b..7132e134d3db0 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 @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);net48-Windows_NT + $(NetCoreAppCurrent);net48-windows diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj index a22f890d5bd57..f94d7cbdb7b2d 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;net461;netstandard2.0 + $(NetCoreAppCurrent)-windows;netcoreapp2.0-windows;net461;netstandard2.0 true $(NoWarn);CA1838 diff --git a/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj b/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj index 8ebc945c1214b..68289a9829ab0 100644 --- a/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj +++ b/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net461 + $(NetCoreAppCurrent)-windows;net461 diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj index 06ae2e9836a55..564f2f435945f 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) enable 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 ad26918fd6eaf..7efbc8bc54c82 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser true true diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index a3963b8307a2c..45ca8874696b6 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;netcoreapp2.0-windows;netstandard2.0;net461 true diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj index 0ddd69a7a648e..ec9fd29024628 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;net461 + $(NetCoreAppCurrent)-windows;net461 diff --git a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index 750902104e1c0..7799b1fbfe4f4 100644 --- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -2,7 +2,7 @@ $(DefineConstants);FEATURE_REGISTRY true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS enable $(NoWarn);0649 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 091c18cdbb75c..74794bd94e3a9 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 @@ -3,7 +3,7 @@ true $(DefineConstants);TargetsWindows true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser true 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 19e5b0799bff4..270e6f2339d17 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 @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) true true diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj index adbd9aecb5211..28f616763a347 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -3,7 +3,7 @@ true $(DefineConstants);FLAVOR_WHIDBEY;PAPI_AD;PAPI_REGSAM;USE_CTX_CACHE true - $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT + $(NetCoreAppCurrent)-windows;netstandard2.0;netcoreapp2.0-windows true $(NoWarn);CA2249 diff --git a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj index ff681406c78e1..280737448fade 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net48 + $(NetCoreAppCurrent)-windows;net48 diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj index c37e4da51fa4b..5d448bcccd8ba 100644 --- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;$(NetCoreAppCurrent)-OSX;netcoreapp2.0-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp2.0-Linux;netstandard2.0 + $(NetCoreAppCurrent)-windows;netcoreapp2.0-windows;$(NetCoreAppCurrent)-OSX;netcoreapp2.0-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp2.0-Linux;netstandard2.0 true diff --git a/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj b/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj index 1175b1d42159f..10c29c9a19e68 100644 --- a/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;net48 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;net48 diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index 7751f4e3d475a..311e3ab3413ea 100644 --- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT + $(NetCoreAppCurrent)-windows;netstandard2.0;netcoreapp2.0-windows true true diff --git a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj index f71b684f686bd..30ff378f13806 100644 --- a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj +++ b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj @@ -2,7 +2,7 @@ $(NoWarn);SYSLIB0003 - $(NetCoreAppCurrent)-Windows_NT;net48 + $(NetCoreAppCurrent)-windows;net48 diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj index 88201ea00bd48..7ced0e244b4e1 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -5,7 +5,7 @@ CS0618 $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS;FEATURE_SYSTEM_EVENTS true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.0-Windows_NT;netcoreapp3.0-Unix;netcoreapp3.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.0-windows;netcoreapp3.0-Unix;netcoreapp3.0 true enable 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 1371f91e3d1a0..e84c4ed3c71b0 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,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net48 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;net48 diff --git a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj index fd17cd2352c3f..516e21286635b 100644 --- a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj +++ b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj @@ -2,7 +2,7 @@ System.Drawing $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj b/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj index 2a7bae9d109b7..621d668ad242e 100644 --- a/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj +++ b/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj @@ -1,6 +1,6 @@  - $(NetCoreAppCurrent)-Windows_NT + $(NetCoreAppCurrent)-windows true diff --git a/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj b/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj index e1c20d97ca766..dbbb13abb479d 100644 --- a/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj +++ b/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj @@ -4,7 +4,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT + $(NetCoreAppCurrent)-windows 13.0 diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj index bdb837e5ef95e..3404630ffaf65 100644 --- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj +++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) 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 86112e76c058a..49f3ee89205ac 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,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj index 48daf8eee6790..df5985bcfdd8b 100644 --- a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj +++ b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj @@ -1,7 +1,7 @@  true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable 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 63c5661623fc5..76861245405f1 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 481ae54f0926e..503971f5c7a22 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netstandard2.0-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;netstandard2.0;netstandard2.0-windows;net461-windows true enable diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj index 663ab486f555b..c3d83e8544137 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;net461-windows diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj index cac7326d0c2cf..c516eb543e334 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj +++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj index 0ed41b1cbbb4f..be64739138482 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj +++ b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj index fcab1dcb4e9b6..f6f195f6d42c0 100644 --- a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj +++ b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD enable diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj index f0339a66035ba..6198325a2dfb7 100644 --- a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj +++ b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD diff --git a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj index 28dfd4667be0c..a8ce9dc085800 100644 --- a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable 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 8505c8d80cbe8..99d9dcd4fce26 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 @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser --working-dir=/test-dir diff --git a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj index 066018d64f7c0..4861416efa901 100644 --- a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj +++ b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) enable 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 57f315d885061..b37dff5c1d897 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj index 875e392be7080..e0a5390f9a62f 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj +++ b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj index f0c3ca4b20818..fe22f092ca35a 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj +++ b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser 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 41d84a2596114..f9a26bb66dc20 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net48-Windows_NT + $(NetCoreAppCurrent);net48-windows diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj index 81ac8d687ca3f..c65729e936ddc 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj @@ -1,7 +1,7 @@ enable - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) diff --git a/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj b/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj index 82cd7df4411d8..2e0f3fe42c629 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT + $(NetCoreAppCurrent)-windows diff --git a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj index c3744e29ba8eb..b322b78d77199 100644 --- a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) enable 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 90c00efb8d3cb..ca262a152b46c 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 @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) true diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj index 1efe6c62d4653..7deeb2c937d11 100644 --- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj @@ -4,7 +4,7 @@ $(DefineConstants);NOSPAN;SERIAL_PORTS true annotations - netstandard2.0-Windows_NT;netstandard2.0-Linux;netstandard2.0-OSX;netstandard2.0;net461-Windows_NT;netstandard2.0-FreeBSD + netstandard2.0-windows;netstandard2.0-Linux;netstandard2.0-OSX;netstandard2.0;net461-windows;netstandard2.0-FreeBSD diff --git a/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj b/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj index d0797175561fb..4b498002d8020 100644 --- a/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj +++ b/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-FreeBSD;net461-Windows_NT + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-FreeBSD;net461-windows diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index c91da1b9c5b69..a63b602192b42 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -3,7 +3,7 @@ true $(NoWarn);0618 true - $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT + $(NetCoreAppCurrent)-windows;netstandard2.0;netcoreapp2.0-windows true diff --git a/src/libraries/System.Management/tests/System.Management.Tests.csproj b/src/libraries/System.Management/tests/System.Management.Tests.csproj index dfa032993bcd7..6592e12738f4d 100644 --- a/src/libraries/System.Management/tests/System.Management.Tests.csproj +++ b/src/libraries/System.Management/tests/System.Management.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net48 + $(NetCoreAppCurrent)-windows;net48 diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index abf521f9ccf25..8e62c79985b8c 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -1,7 +1,7 @@ true - netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT + netstandard2.0-windows;netstandard2.0;net461-windows true enable diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj index 48ed90347107f..4bbd2f502e116 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net48-Windows_NT + $(NetCoreAppCurrent)-windows;net48-windows true $(DefineConstants);WINHTTPHANDLER_TEST 8.0 diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj index ef997a5d4631f..32e7c9c9e44aa 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj @@ -3,7 +3,7 @@ $(NoWarn);0436 true ../../src/Resources/Strings.resx - $(NetCoreAppCurrent)-Windows_NT + $(NetCoreAppCurrent)-windows annotations diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj index e38d9a0223774..febae717a7fe9 100644 --- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj +++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj @@ -3,7 +3,7 @@ win true $(DefineConstants);HTTP_DLL - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser enable 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 ea6ee06676666..bbeb133ce8841 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 @@ -6,7 +6,7 @@ $(DefineConstants);SYSNETHTTP_NO_OPENSSL;HTTP3 true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX ../../src/Resources/Strings.resx true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS annotations diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj index c0af10c41b83b..e4b46039e9526 100644 --- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj +++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj @@ -2,7 +2,7 @@ true false - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable SR.SystemNetHttpListener_PlatformNotSupported diff --git a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj index 2cb8e45108846..ff51965c78958 100644 --- a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj +++ b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj @@ -2,7 +2,7 @@ true ../src/Resources/Strings.resx - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX true diff --git a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj index cad02d8a38a7f..2734888449cf3 100644 --- a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj +++ b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj index 06a2e27ed6424..a6a33b01acc1a 100644 --- a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj +++ b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj @@ -2,7 +2,7 @@ true ../../src/Resources/Strings.resx - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser annotations diff --git a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj index 3119914a55ed5..e3b9514b5578a 100644 --- a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj +++ b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj index c9984c4fc86b9..2f9dea9c37cde 100644 --- a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser true true diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj index 810e46d593eb6..af74fd3923b42 100644 --- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj @@ -2,7 +2,7 @@ true ../../src/Resources/Strings.resx - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser annotations true diff --git a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj index 77c8e681cf445..25b9248775043 100644 --- a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj @@ -4,7 +4,7 @@ true 0436 - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser annotations true diff --git a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index 21f4f94faf5c8..ae6fb33863f0c 100644 --- a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD enable diff --git a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj index e289d5ce0500e..18384df922b31 100644 --- a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj +++ b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj index 299a207b4967e..86a7dacccaefd 100644 --- a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj +++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser true true true diff --git a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj index d2c79e1ab57b4..14827f6ce6cf9 100644 --- a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj @@ -2,7 +2,7 @@ true false - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj index 26cd2568e1570..dd03580696255 100644 --- a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj index 8f39f56731b94..0d48b7390264b 100644 --- a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj @@ -2,7 +2,7 @@ true ../../src/Resources/Strings.resx - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj b/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj index 52343e0f9b081..a3e3181dc26ec 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix diff --git a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj index b21e3f4132676..542e4465d5719 100644 --- a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj +++ b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj index 2a4ed69ad0f0f..f76a401f6512e 100644 --- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj +++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS $(DefineConstants);PRODUCT enable 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 2bfd9ee51808d..656c5df972016 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 @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS annotations true diff --git a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj index 1d83e45035d66..9835fac615253 100644 --- a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj @@ -10,7 +10,7 @@ 436 $(NoWarn);3021 - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS annotations true diff --git a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj index 9d398e8a6844e..c52df4c00e918 100644 --- a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj index 87813790a0416..fee81761de6fe 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser true diff --git a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj index df8a1db87995b..36dc02dc2b99e 100644 --- a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj +++ b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) System.Xml true $(DefineConstants);FEATURE_COMPILED_XSL - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) enable 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 b48848c7a4545..65be989ba53a2 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;net461 true 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 e049d6d494caf..93826bfd29f1c 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 @@ -4,7 +4,7 @@ true true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj index 8deeb858dbbcf..0d934ab9b2424 100644 --- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj @@ -1,7 +1,7 @@ true - netstandard2.0;netstandard2.0-Windows_NT + netstandard2.0;netstandard2.0-windows true diff --git a/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj b/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj index 84c491d6bfbe2..fdcb758576f51 100644 --- a/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj +++ b/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net48-Windows_NT + $(NetCoreAppCurrent)-windows;net48-windows diff --git a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj index 10f57ac6b1b5e..36a8692d96ba5 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -4,7 +4,7 @@ $(DefineConstants);Unix true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj index 12aab18e3e97b..2ee0caf2d562f 100644 --- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj +++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj @@ -3,7 +3,7 @@ System.Runtime.InteropServices true enable - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj index de6d696e095a8..3edd7d47f72ab 100644 --- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj @@ -1,7 +1,7 @@  true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser 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 a4dab3d3151a3..69396c3d0fb95 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 @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT + $(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows true 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 f862142382897..81e276ce8d175 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 @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net48 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net48 diff --git a/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj b/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj index 39e883658bb35..b7d75d9638b9e 100644 --- a/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj +++ b/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj @@ -3,7 +3,7 @@ true true true - $(NetCoreAppCurrent)-Windows_NT + $(NetCoreAppCurrent)-windows $(NoWarn),SYSLIB0013 diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj index 76cd8ce9ef1cf..532cf6e1e618b 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj @@ -4,7 +4,7 @@ $(NoWarn),1718,SYSLIB0013 true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser true - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0 + $(NetCoreAppCurrent)-windows;net461-windows;netcoreapp2.0-windows;netstandard2.0 true enable diff --git a/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj b/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj index 2d5068b4dcb7a..0d9a67a1f3297 100644 --- a/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj +++ b/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;net461-windows diff --git a/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj b/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj index d70d7393479bc..2c53e1d740319 100644 --- a/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj +++ b/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj @@ -3,7 +3,7 @@ true $(DefineConstants);INTERNAL_ASYMMETRIC_IMPLEMENTATIONS $(NoWarn);CA5350;CA5351;CA5379;CA5384 - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Browser enable 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 90171a9ced583..d7e710958c990 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);netstandard2.1;net461-Windows_NT;netcoreapp3.0-Windows_NT;netcoreapp3.0;net462-Windows_NT;net47-Windows_NT + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.1;net461-windows;netcoreapp3.0-windows;netcoreapp3.0;net462-windows;net47-windows true enable 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 86112ff45cfe9..444131560561e 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 @@ -1,7 +1,7 @@ $(DefineConstants);TESTING_CNG_IMPLEMENTATION - $(NetCoreAppCurrent)-Windows_NT;net47-Windows_NT + $(NetCoreAppCurrent)-windows;net47-windows diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj index 36b40fc201622..da68c42443e03 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj +++ b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) enable 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 a70488b38e812..40c9efcaa5d64 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj index aaf3fc1530b22..8edf084570690 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj +++ b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS enable diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj index 91599eb2c2305..331eb57fcd953 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj @@ -1,7 +1,7 @@  true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index 386d43a204a81..e9db368ef2448 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -5,7 +5,7 @@ true $(NoWarn);CA5384 enable - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);netstandard2.0;netstandard2.0-Windows_NT;netstandard2.1;netstandard2.1-Windows_NT;netcoreapp3.0-Windows_NT;netcoreapp3.0;net461-Windows_NT + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0;netstandard2.0-windows;netstandard2.1;netstandard2.1-windows;netcoreapp3.0-windows;netcoreapp3.0;net461-windows true 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 64a3a8a6cb889..611a17a08d91d 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 @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net48-Windows_NT + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net48-windows true - netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0 + netstandard2.0-windows;net461-windows;netstandard2.0 enable diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj index acdc3f5b65831..928f3b243f3e1 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;net461-windows diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj index 726b4b792a0bf..2c44fb7f11f27 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj +++ b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj @@ -2,7 +2,7 @@ true $(NoWarn);CA5384 - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent); + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent); enable 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 7d818904df241..1ffcaefd56a99 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 @@ -4,7 +4,7 @@ $(DefineConstants);HAVE_THUMBPRINT_OVERLOADS $(DefineConstants);Unix true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS diff --git a/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj index 35536edbef154..b95e5766e1b9f 100644 --- a/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj +++ b/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT + $(NetCoreAppCurrent)-windows $(NoWarn);SYSLIB0003 diff --git a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index d8193f00625fe..97a5b06a6273d 100644 --- a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;netstandard2.0;netcoreapp2.0-Windows_NT;netcoreapp2.0-Unix;netcoreapp2.1-Windows_NT;netcoreapp2.1-Unix;net461-Windows_NT + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;netstandard2.0;netcoreapp2.0-windows;netcoreapp2.0-Unix;netcoreapp2.1-windows;netcoreapp2.1-Unix;net461-windows true enable diff --git a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj index cb45482460cc5..a416eb154f72d 100644 --- a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj +++ b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;net461-windows diff --git a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj index 73ebfaba0e98b..73c1e6cef3465 100644 --- a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461-Windows_NT + $(NetCoreAppCurrent);netstandard2.0;net461-windows true true 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 d85a1393b8d02..037fe58d8b95c 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461-Windows_NT + $(NetCoreAppCurrent);net461-windows diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 3095fb9ad7647..7cf866982fc86 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netstandard2.0-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;netstandard2.0;netstandard2.0-windows;net461-windows true $(NoWarn);CA2249 enable diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj index 2bf38334f76d0..f09c00f50cb83 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;net461-windows diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index 375255d388351..fc36d49bc9ea6 100644 --- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netstandard2.0-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows;netstandard2.0;netcoreapp2.0-windows;netstandard2.0-windows;net461-windows true true diff --git a/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj b/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj index 0b05fa533b0e5..569288d61d2ba 100644 --- a/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);net461-Windows_NT + $(NetCoreAppCurrent);net461-windows diff --git a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index 5a898d9ccf621..a63c89a854729 100644 --- a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -1,6 +1,6 @@ - netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0 + netstandard2.0-windows;net461-windows;netstandard2.0 true enable diff --git a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj index 5d41e0bac88da..4c7946f33b824 100644 --- a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj +++ b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + $(NetCoreAppCurrent)-windows;net461-windows true - $(NetCoreAppCurrent)-Windows_NT;netcoreapp3.0-Windows_NT;$(NetCoreAppCurrent);netcoreapp3.0 + $(NetCoreAppCurrent)-windows;netcoreapp3.0-windows;$(NetCoreAppCurrent);netcoreapp3.0 true 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 f0f105858a701..fac6e53faf410 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT + $(NetCoreAppCurrent)-windows diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj index c05ee437a0459..20eb5e92624ef 100644 --- a/src/libraries/externals.csproj +++ b/src/libraries/externals.csproj @@ -55,7 +55,7 @@ SkipUnchangedFiles="true" UseHardlinksIfPossible="$(UseHardlink)" /> - + - $(LinkerNoWarn);IL2008 + $(LinkerNoWarn);IL2008 $(LinkerNoWarn);IL2012 $(ILLinkArgs) --nowarn $(LinkerNoWarn) @@ -71,7 +71,7 @@ <_SuppressionsXmls Include="$(CoreLibSharedILLinkSuppressionsFilesPrefix).xml" /> - <_SuppressionsXmls Condition="'$(TargetOS)' != 'Windows_NT'" Include="$(CoreLibSharedILLinkSuppressionsFilesPrefix).NonWindows.xml" /> + <_SuppressionsXmls Condition="'$(TargetOS)' != 'windows'" Include="$(CoreLibSharedILLinkSuppressionsFilesPrefix).NonWindows.xml" /> <_SuppressionsXmls Condition="'$(RuntimeFlavor)' == 'Mono'" Include="$(MonoProjectRoot)netcore\System.Private.CoreLib\$(ProjectILLinkSuppressionsFile).xml" /> diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index ad8755f55c32a..56e0dd1fc5319 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -6,7 +6,7 @@ --> - true + true $(BUILD_BUILDNUMBER) diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props index d636f1aebac3d..738bf3c5566cc 100644 --- a/src/mono/Directory.Build.props +++ b/src/mono/Directory.Build.props @@ -45,7 +45,7 @@ true true true - true + true true diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj index be7c512f391a5..7dc4ff78a71a6 100644 --- a/src/tests/Common/helixpublishwitharcade.proj +++ b/src/tests/Common/helixpublishwitharcade.proj @@ -77,7 +77,7 @@ $(TargetOS)$(TargetOSSubgroup) - win-$(TargetArchitecture) + win-$(TargetArchitecture) osx-$(TargetArchitecture) linux-$(TargetArchitecture) linux-musl-$(TargetArchitecture) diff --git a/src/tests/Common/scripts/arm32_ci_script.sh b/src/tests/Common/scripts/arm32_ci_script.sh index 1dd269c39815f..8e9104b6a447b 100755 --- a/src/tests/Common/scripts/arm32_ci_script.sh +++ b/src/tests/Common/scripts/arm32_ci_script.sh @@ -16,7 +16,7 @@ function usage { echo ' --emulatorPath=/opt/linux-arm-emulator' echo ' --mountPath=/opt/linux-arm-emulator-root' echo ' --buildConfig=Release' - echo ' --testRootDir=~/Downloads/Windows_NT.x64.Release' + echo ' --testRootDir=~/Downloads/windows.x64.Release' echo ' --mscorlibDir=~/clr/bin/bin/coreclr/Linux.armel.Release' echo ' --coreFxNativeBinDir=~/cfx/bin/Linux.armel.Release' echo ' --coreFxBinDir="~/cfx/bin/Linux.AnyCPU.Release;~/cfx/bin/Unix.AnyCPU.Release;~/cfx/bin/AnyOS.AnyCPU.Release"' diff --git a/src/tests/Common/scripts/arm32_ci_test.sh b/src/tests/Common/scripts/arm32_ci_test.sh index d14c7841dcb09..aee795378f4de 100755 --- a/src/tests/Common/scripts/arm32_ci_test.sh +++ b/src/tests/Common/scripts/arm32_ci_test.sh @@ -110,6 +110,6 @@ chroot ${__ROOTFS_DIR} /bin/bash -x < : Root directory of the test build (e.g. runtime/artifacts/tests/Windows_NT.x64.Debug).' + echo ' --testRootDir= : Root directory of the test build (e.g. runtime/artifacts/tests/windows.x64.Debug).' echo ' --testNativeBinDir= : Directory of the native CoreCLR test build (e.g. runtime/artifacts/obj/Linux.x64.Debug/tests).' echo ' (Also required: Either --coreOverlayDir, or all of the switches --coreOverlayDir overrides)' echo '' diff --git a/src/tests/Common/scripts/format.py b/src/tests/Common/scripts/format.py index 2f2b4cf872f56..8fc4ca8afa1df 100644 --- a/src/tests/Common/scripts/format.py +++ b/src/tests/Common/scripts/format.py @@ -115,7 +115,7 @@ def main(argv): if platform == 'Linux' or platform == 'OSX': bootstrapFilename = "bootstrap.sh" - elif platform == 'Windows_NT': + elif platform == 'windows': bootstrapFilename = "bootstrap.cmd" bootstrapUrl = "https://raw.githubusercontent.com/dotnet/jitutils/master/" + bootstrapFilename @@ -132,7 +132,7 @@ def main(argv): print("Did not download bootstrap!") return -1 - if platform == 'Windows_NT': + if platform == 'windows': # Need to ensure we have Windows line endings on the downloaded script file, # which is downloaded with Unix line endings. print('Convert', bootstrapPath, 'to Windows line endings') @@ -157,7 +157,7 @@ def main(argv): print('Running:', 'bash', bootstrapPath) proc = subprocess.Popen(['bash', bootstrapPath], env=my_env) output,error = proc.communicate() - elif platform == 'Windows_NT': + elif platform == 'windows': print('Running:', bootstrapPath) proc = subprocess.Popen([bootstrapPath], env=my_env) output,error = proc.communicate() @@ -181,7 +181,7 @@ def main(argv): if platform == 'Linux' or platform == 'OSX': jitformat = os.path.join(jitformat, "jit-format") - elif platform == 'Windows_NT': + elif platform == 'windows': jitformat = os.path.join(jitformat,"jit-format.bat") errorMessage = "" diff --git a/src/tests/Common/scripts/run-corefx-tests.bat b/src/tests/Common/scripts/run-corefx-tests.bat index e5bfa984308ff..f7a2040951bb5 100644 --- a/src/tests/Common/scripts/run-corefx-tests.bat +++ b/src/tests/Common/scripts/run-corefx-tests.bat @@ -13,7 +13,7 @@ echo corefx tree, including tests, and then copying the built runtime layout and echo to the ARM/ARM64 machine. echo. echo Arguments: -echo ^ -- Path to corefx-built runtime "layout", e.g. _\fx\bin\testhost\netcoreapp-Windows_NT-Release-arm +echo ^ -- Path to corefx-built runtime "layout", e.g. _\fx\bin\testhost\netcoreapp-windows-Release-arm echo ^ -- Path to corefx test tree, e.g., _\fx\bin\tests echo ^ -- Path to test exclusion file, e.g., C:\coreclr\tests\arm\corefx_test_exclusions.txt echo ^ -- Architecture to run, either ARM or ARM64. (We can't depend on PROCESSOR_ARCHITECTURE because @@ -56,7 +56,7 @@ set _skipped=0 set _total=0 pushd %_tests_dir% -for /F %%i in ('dir /s /b /A:D netcoreapp-Windows_NT-Release-%_architecture%') do ( +for /F %%i in ('dir /s /b /A:D netcoreapp-windows-Release-%_architecture%') do ( if exist %%i\RunTests.cmd call :one %%i ) popd @@ -70,15 +70,15 @@ exit /b 0 set /A _total=_total + 1 REM Extract out the test name from the path. -REM The path looks like: e:\gh\corefx\bin\tests\System.Management.Tests\netcoreapp-Windows_NT-Release-arm +REM The path looks like: e:\gh\corefx\bin\tests\System.Management.Tests\netcoreapp-windows-Release-arm REM From this, we want System.Management.Tests to compare against the exclusion file, which should be a list REM of test names to skip. set _t1=%1 if /i %_architecture%==arm ( - set _t2=%_t1:\netcoreapp-Windows_NT-Release-arm=% + set _t2=%_t1:\netcoreapp-windows-Release-arm=% ) else ( - set _t2=%_t1:\netcoreapp-Windows_NT-Release-arm64=% + set _t2=%_t1:\netcoreapp-windows-Release-arm64=% ) for /F %%j in ("%_t2%") do set _t3=%%~nxj findstr /i %_t3% %_exclusion_file% >nul diff --git a/src/tests/Common/scripts/run-gc-reliability-framework.cmd b/src/tests/Common/scripts/run-gc-reliability-framework.cmd index 3d3e699213ee3..be8e5cebed328 100644 --- a/src/tests/Common/scripts/run-gc-reliability-framework.cmd +++ b/src/tests/Common/scripts/run-gc-reliability-framework.cmd @@ -3,8 +3,8 @@ @echo off -set CORE_ROOT=%CD%\artifacts\tests\Windows_NT.%1.%2\Tests\Core_Root -set FRAMEWORK_DIR=%CD%\artifacts\tests\Windows_NT.%1.%2\GC\Stress\Framework\ReliabilityFramework +set CORE_ROOT=%CD%\artifacts\tests\windows.%1.%2\Tests\Core_Root +set FRAMEWORK_DIR=%CD%\artifacts\tests\windows.%1.%2\GC\Stress\Framework\ReliabilityFramework powershell -NoProfile "%CORE_ROOT%\CoreRun.exe %FRAMEWORK_DIR%\ReliabilityFramework.exe %FRAMEWORK_DIR%\testmix_gc.config" if %ERRORLEVEL% == 100 ( @rem The ReliabilityFramework returns 100 on success and 99 on failure diff --git a/src/tests/Common/scripts/run-pmi-diffs.py b/src/tests/Common/scripts/run-pmi-diffs.py index 30f92686c6c9a..cd24aaf108b6b 100755 --- a/src/tests/Common/scripts/run-pmi-diffs.py +++ b/src/tests/Common/scripts/run-pmi-diffs.py @@ -67,7 +67,7 @@ } Is_windows = (os.name == 'nt') -Clr_os = 'Windows_NT' if Is_windows else Unix_name_map[os.uname()[0]] +Clr_os = 'windows' if Is_windows else Unix_name_map[os.uname()[0]] ########################################################################## # Delete protocol @@ -452,7 +452,7 @@ def do_pmi_diffs(): dotnetcliUrl = "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm64.tar.gz" elif Clr_os == 'OSX': dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.1.402/dotnet-sdk-2.1.402-osx-x64.tar.gz" - elif Clr_os == 'Windows_NT': + elif Clr_os == 'windows': dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.1.402/dotnet-sdk-2.1.402-win-x64.zip" else: log('ERROR: unknown or unsupported OS (%s) architecture (%s) combination' % (Clr_os, arch)) diff --git a/src/tests/Common/setup-stress-dependencies.cmd b/src/tests/Common/setup-stress-dependencies.cmd index bb44dc7d7e39f..77d893154adb4 100644 --- a/src/tests/Common/setup-stress-dependencies.cmd +++ b/src/tests/Common/setup-stress-dependencies.cmd @@ -67,7 +67,7 @@ REM ============================================================================ REM Download the package echo Downloading CoreDisTools package -set CoreDisToolsPackagePathOutputFile="%__RepoRootDir%artifacts\obj\coreclr\Windows_NT.%__Arch%\coredistoolspath.txt" +set CoreDisToolsPackagePathOutputFile="%__RepoRootDir%artifacts\obj\coreclr\windows.%__Arch%\coredistoolspath.txt" set CommonMSBuildOptions=/p:TargetArchitecture=%__Arch% /p:Configuration=%__BuildType% /p:RuntimeIdentifier="win-%__Arch%" /p:PackageRuntimeIdentifier="win-%__Arch%" set DOTNETCMD="%__DotNetCmd%" restore "%__CsprojPath%" %CommonMSBuildOptions% diff --git a/src/tests/Common/test_dependencies/test_dependencies.csproj b/src/tests/Common/test_dependencies/test_dependencies.csproj index f807dd4889432..106e50602676a 100644 --- a/src/tests/Common/test_dependencies/test_dependencies.csproj +++ b/src/tests/Common/test_dependencies/test_dependencies.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/tests/Common/testgrouping.proj b/src/tests/Common/testgrouping.proj index 3c32bf77e227d..178cb72fc8eab 100644 --- a/src/tests/Common/testgrouping.proj +++ b/src/tests/Common/testgrouping.proj @@ -10,7 +10,7 @@ $(TestBinDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll - + JIT.jit64.mcc $(TestBinDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index 1745b705b8caa..ed2e457a2a352 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -112,7 +112,7 @@ - +