diff options
Diffstat (limited to 'tests')
10 files changed, 18 insertions, 18 deletions
diff --git a/tests/dir.props b/tests/dir.props index bef7afc53e..cb56369af5 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -19,7 +19,7 @@ Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer as well as running the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. - It also breaks building any C# project with dotnet.exe on Windows. The windows version of BuildTools doesn't appear to download the .Net Core + It also breaks building any C# project with dotnet.exe on Windows. The windows version of BuildTools doesn't appear to download the .NET Core Roslyn NuGet package which has a Csc task supporting OverrideToolHost, but the default BuildTools CSharpCore targets file does specify OverrideToolHost. The result is that building anything in C# when RunningOnCore=true on Windows fails in Csc task with a parameter not supported error. diff --git a/tests/scripts/format.py b/tests/scripts/format.py index b622cf4625..5ed90968c9 100644 --- a/tests/scripts/format.py +++ b/tests/scripts/format.py @@ -69,7 +69,7 @@ def main(argv): my_env = os.environ - # Download .Net CLI + # Download .NET CLI dotnetcliUrl = "" dotnetcliFilename = "" @@ -88,7 +88,7 @@ def main(argv): if not os.path.isdir(dotnetcliPath): raise - print("Downloading .Net CLI") + print("Downloading .NET CLI") if platform == 'Linux': dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.1.402/dotnet-sdk-2.1.402-linux-x64.tar.gz" dotnetcliFilename = os.path.join(dotnetcliPath, 'dotnetcli-jitutils.tar.gz') @@ -106,10 +106,10 @@ def main(argv): urlretrieve(dotnetcliUrl, dotnetcliFilename) if not os.path.isfile(dotnetcliFilename): - print("Did not download .Net CLI!") + print("Did not download .NET CLI!") return -1 - # Install .Net CLI + # Install .NET CLI if platform == 'Linux' or platform == 'OSX': tar = tarfile.open(dotnetcliFilename) @@ -127,7 +127,7 @@ def main(argv): if not os.path.isfile(os.path.join(dotnetcliPath, dotnet)): - print("Did not extract .Net CLI from download") + print("Did not extract .NET CLI from download") return -1 # Download bootstrap diff --git a/tests/scripts/run-pmi-diffs.py b/tests/scripts/run-pmi-diffs.py index d1e5954b93..e02f409dc3 100755 --- a/tests/scripts/run-pmi-diffs.py +++ b/tests/scripts/run-pmi-diffs.py @@ -437,7 +437,7 @@ def do_pmi_diffs(): # Download .NET CLI - log('Downloading .Net CLI') + log('Downloading .NET CLI') dotnetcliUrl = "" dotnetcliFilename = "" @@ -469,12 +469,12 @@ def do_pmi_diffs(): urlretrieve(dotnetcliUrl, dotnetcliFilename) if not os.path.isfile(dotnetcliFilename): - log('ERROR: Did not download .Net CLI') + log('ERROR: Did not download .NET CLI') return 1 - # Install .Net CLI + # Install .NET CLI - log('Unpacking .Net CLI') + log('Unpacking .NET CLI') if not testing: if Is_windows: @@ -486,7 +486,7 @@ def do_pmi_diffs(): tar.close() if not os.path.isfile(os.path.join(dotnetcliPath, dotnet_tool)): - log('ERROR: did not extract .Net CLI from download') + log('ERROR: did not extract .NET CLI from download') return 1 # Add dotnet CLI to PATH we'll use to spawn processes. diff --git a/tests/src/JIT/Methodical/cctor/misc/testlib.cs b/tests/src/JIT/Methodical/cctor/misc/testlib.cs index c5fb330579..5035f185ad 100644 --- a/tests/src/JIT/Methodical/cctor/misc/testlib.cs +++ b/tests/src/JIT/Methodical/cctor/misc/testlib.cs @@ -33,7 +33,7 @@ namespace Precise } Console.WriteLine("in .cctor(), measure.a is {0}", measure.a); Console.WriteLine("Current thread is {0}", Thread.CurrentThread.Name); - // Following two lines commented because not available in .Net Core + // Following two lines commented because not available in .NET Core // Console.WriteLine("Calling assembly is {0}", Assembly.GetCallingAssembly().FullName); // Console.WriteLine("This assembly is {0}", Assembly.GetExecutingAssembly().FullName); measure.a += 8; diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs index 841db0897a..47e2bace0a 100644 --- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs +++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/regex-redux-5.cs @@ -29,7 +29,7 @@ namespace BenchmarksGame { static Regex regex(string re) { - // Not compiled on .Net Core, hence poor benchmark results. + // Not compiled on .NET Core, hence poor benchmark results. return new Regex(re, RegexOptions.Compiled); } diff --git a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj index f376265528..aff76cd327 100644 --- a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj +++ b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj @@ -13,7 +13,7 @@ <CLRTestKind>BuildAndRun</CLRTestKind> <CLRTestPriority>1</CLRTestPriority> - <!-- Test fails to build on .Net Core 3.0 preview3 --> + <!-- Test fails to build on .NET Core 3.0 preview3 --> <DisableProjectBuild Condition="'$(__BuildOS)' == 'OSX'">true</DisableProjectBuild> </PropertyGroup> <ItemGroup> diff --git a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj index e3a657319a..c608d69e59 100644 --- a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj +++ b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj @@ -13,7 +13,7 @@ <CLRTestKind>BuildAndRun</CLRTestKind> <CLRTestPriority>1</CLRTestPriority> - <!-- Test fails to build on .Net Core 3.0 preview3 --> + <!-- Test fails to build on .NET Core 3.0 preview3 --> <DisableProjectBuild Condition="'$(__BuildOS)' == 'OSX'">true</DisableProjectBuild> </PropertyGroup> <ItemGroup> diff --git a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj index 7d59baaa49..8099668004 100644 --- a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj +++ b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj @@ -13,7 +13,7 @@ <CLRTestKind>BuildAndRun</CLRTestKind> <CLRTestPriority>1</CLRTestPriority> - <!-- Test fails to build on .Net Core 3.0 preview3 --> + <!-- Test fails to build on .NET Core 3.0 preview3 --> <DisableProjectBuild Condition="'$(__BuildOS)' == 'OSX'">true</DisableProjectBuild> </PropertyGroup> diff --git a/tests/src/performance/Scenario/JitBench/unofficial_dotnet/README.md b/tests/src/performance/Scenario/JitBench/unofficial_dotnet/README.md index fd86d7bf37..bc961abd67 100644 --- a/tests/src/performance/Scenario/JitBench/unofficial_dotnet/README.md +++ b/tests/src/performance/Scenario/JitBench/unofficial_dotnet/README.md @@ -185,4 +185,4 @@ CoreCLR CI machines don't currently support building netcoreapp2.0 projects auth C:\Program Files\dotnet\sdk\1.1.0\Sdks\Microsoft.NET.Sdk\build\Microsoft.NET.TargetFrameworkInference.targets(112,5): error : The current .NET SDK does not support targeting .NET Core 2.0. Either target .NET Core 1.1 or lower, or use a version of the .NET SDK that supports .NET Core 2.0. [D:\j\workspace\x64_checked_w---eac6a79c\tests\src\performance\Scenario\JitBench\JitBench.csproj] -I assume the CI machines have fairly old SDK tools installed but I didn't have enough time to keep investigating these build issues. From I can tell if you have .Net Core 2.0+ SDK installed on your machine this build works fine from the command line and from VS. +I assume the CI machines have fairly old SDK tools installed but I didn't have enough time to keep investigating these build issues. From I can tell if you have .NET Core 2.0+ SDK installed on your machine this build works fine from the command line and from VS. diff --git a/tests/src/performance/linkbench/scripts/clone.cmd b/tests/src/performance/linkbench/scripts/clone.cmd index 902fad470e..6b69c0f9f2 100644 --- a/tests/src/performance/linkbench/scripts/clone.cmd +++ b/tests/src/performance/linkbench/scripts/clone.cmd @@ -17,7 +17,7 @@ popd exit /b %EXITCODE% :DotNet -REM We clone different versions of .Net CLI in order to cope with +REM We clone different versions of .NET CLI in order to cope with REM different runtimes that the benchmarks target, and certain limitations REM in the ILLink/CLI integration and packaging. REM |