зеркало из https://github.com/dotnet/sdk.git
Merge branch 'main' into FixCodeOwnersFile
# Conflicts: # CODEOWNERS
This commit is contained in:
Michael Yanni
Коммит
cf98059e4d
16
CODEOWNERS
16
CODEOWNERS
|
|
@ -14,17 +14,17 @@
|
|||
# Area-AspNetCore
|
||||
/src/BlazorWasmSdk/ @dotnet/aspnet-blazor-eng
|
||||
/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ @dotnet/aspnet-blazor-eng
|
||||
/src/Assets/TestProjects/BlazorHosted/ @dotnet/aspnet-blazor-eng
|
||||
/src/Assets/TestProjects/BlazorHostedRID/ @dotnet/aspnet-blazor-eng
|
||||
/src/Assets/TestProjects/BlazorWasmMinimal/ @dotnet/aspnet-blazor-eng
|
||||
/src/Assets/TestProjects/BlazorWasmWithLibrary/ @dotnet/aspnet-blazor-eng
|
||||
/test/TestAssets/TestProjects/BlazorHosted/ @dotnet/aspnet-blazor-eng
|
||||
/test/TestAssets/TestProjects/BlazorHostedRID/ @dotnet/aspnet-blazor-eng
|
||||
/test/TestAssets/TestProjects/BlazorWasmMinimal/ @dotnet/aspnet-blazor-eng
|
||||
/test/TestAssets/TestProjects/BlazorWasmWithLibrary/ @dotnet/aspnet-blazor-eng
|
||||
/src/RazorSdk/ @dotnet/razor-compiler
|
||||
/test/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/ @dotnet/aspnet-blazor-eng
|
||||
/test/Microsoft.NET.Sdk.Razor.Tests/ @dotnet/razor-compiler
|
||||
/test/Microsoft.NET.Sdk.Razor.Tool.Tests/ @dotnet/razor-compiler
|
||||
/src/Assets/TestPackages/PackageLibraryDirectDependency/ @dotnet/aspnet-blazor-eng
|
||||
/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @dotnet/aspnet-blazor-eng
|
||||
/src/src/Assets/TestProjects/Razor*/ @dotnet/razor-compiler
|
||||
/test/TestAssets/TestPackages/PackageLibraryDirectDependency/ @dotnet/aspnet-blazor-eng
|
||||
/test/TestAssets/TestPackages/PackageLibraryTransitiveDependency/ @dotnet/aspnet-blazor-eng
|
||||
/test/TestAssets/TestProjects/Razor*/ @dotnet/razor-compiler
|
||||
|
||||
# Area-Wasm
|
||||
/src/WasmSdk @lewing @akoeplinger @pavelsavara @maraf
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
|
||||
|
||||
# Area-Watch
|
||||
/src/Assets/TestProjects/Watch*/ @tmat @arkalyanms @dotnet/roslyn-ide
|
||||
/test/TestAssets/TestProjects/Watch*/ @tmat @arkalyanms @dotnet/roslyn-ide
|
||||
/test/dotnet-watch.Tests/ @tmat @arkalyanms @dotnet/roslyn-ide
|
||||
/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @dotnet/aspnet-blazor-eng
|
||||
/src/BuiltInTools/* @tmat @arkalyanms @dotnet/roslyn-ide
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"solution": {
|
||||
"path": "sdk.sln",
|
||||
"projects": [
|
||||
"src\\Assets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj",
|
||||
"test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj",
|
||||
"src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj",
|
||||
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
|
||||
"src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj",
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ robocopy %HELIX_CORRELATION_PAYLOAD%\t\TestExecutionDirectoryFiles %TestExecutio
|
|||
|
||||
set DOTNET_SDK_TEST_EXECUTION_DIRECTORY=%TestExecutionDirectory%
|
||||
set DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\r
|
||||
set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\assets
|
||||
set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\TestAssets
|
||||
|
||||
REM call dotnet new so the first run message doesn't interfere with the first test
|
||||
dotnet new --debug:ephemeral-hive
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ cp -a $HELIX_CORRELATION_PAYLOAD/t/TestExecutionDirectoryFiles/. $TestExecutionD
|
|||
|
||||
export DOTNET_SDK_TEST_EXECUTION_DIRECTORY=$TestExecutionDirectory
|
||||
export DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=$HELIX_CORRELATION_PAYLOAD/r
|
||||
export DOTNET_SDK_TEST_ASSETS_DIRECTORY=$TestExecutionDirectory/Assets
|
||||
export DOTNET_SDK_TEST_ASSETS_DIRECTORY=$TestExecutionDirectory/TestAssets
|
||||
|
||||
# call dotnet new so the first run message doesn't interfere with the first test
|
||||
dotnet new --debug:ephemeral-hive
|
||||
|
|
|
|||
2
sdk.sln
2
sdk.sln
|
|
@ -389,7 +389,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompat.
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompat.Tests", "test\Microsoft.DotNet.ApiCompat.Tests\Microsoft.DotNet.ApiCompat.Tests.csproj", "{A9103B98-D888-4260-8A05-FA36F640698A}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TestTemplates", "src\Assets\TestPackages\dotnet-new\Microsoft.TemplateEngine.TestTemplates.csproj", "{C37EC61D-6A88-4C15-B371-A61F23EF9072}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TestTemplates", "test\TestAssets\TestPackages\dotnet-new\Microsoft.TemplateEngine.TestTemplates.csproj", "{C37EC61D-6A88-4C15-B371-A61F23EF9072}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{06260DC7-BA64-42BE-B99C-6069A1C3E70E}"
|
||||
EndProject
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFrameworks>$(CurrentTargetFramework);net462</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\TestLibrary\TestLibrary.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace TestApp
|
||||
{
|
||||
class Program
|
||||
{
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
Console.WriteLine(TestLibrary.Helper.GetMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace TestApp
|
||||
{
|
||||
class Program
|
||||
{
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
Console.WriteLine(TestLibrary.Helper.GetMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net462</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\TestLibrary\TestLibrary.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace TestLibrary
|
||||
{
|
||||
public static class Helper
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets the message from the helper. This comment is here to help test XML documentation file generation, do not remove it.
|
||||
/// </summary>
|
||||
/// <returns>A message</returns>
|
||||
public static string GetMessage()
|
||||
{
|
||||
return "This string came from the test library!";
|
||||
}
|
||||
|
||||
public static void SayHi()
|
||||
{
|
||||
Console.WriteLine("Hello there!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<!--
|
||||
Sometimes it is useful to play around with the test assets
|
||||
directly where you're authoring them, and they should never
|
||||
get the build customization from the rest of the repo.
|
||||
-->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<CheckEolTargetFramework>false</CheckEolTargetFramework>
|
||||
<DefaultItemExcludes>$(DefaultItemExcludes);**/*.tmp</DefaultItemExcludes>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<!--
|
||||
Sometimes it is useful to play around with the test assets
|
||||
directly where you're authoring them, and they should never
|
||||
get the build customization from the rest of the repo.
|
||||
-->
|
||||
<Project />
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
|
||||
namespace ConsoleApplication
|
||||
{
|
||||
public class Program
|
||||
{
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
Console.WriteLine("Hello Portable World!");
|
||||
|
||||
var depsFile = new FileInfo(AppContext.GetData("FX_DEPS_FILE") as string);
|
||||
string frameworkVersion = depsFile.Directory.Name;
|
||||
|
||||
Console.WriteLine($"I'm running on shared framework version {frameworkVersion}!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<!--<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />-->
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- netcoreapp2.2 is the maximum TFM project tools support -->
|
||||
<TargetFramework>netcoreapp2.2</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
<IsPackable>true</IsPackable>
|
||||
|
||||
<EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
|
||||
<EnableSourceLink>false</EnableSourceLink>
|
||||
<DeterministicSourcePaths>false</DeterministicSourcePaths>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace ConsoleApplication
|
||||
{
|
||||
public class Program
|
||||
{
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
Console.WriteLine("Hello I prefer the cli runtime World!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- netcoreapp2.2 the maximum TFM project tools support -->
|
||||
<TargetFramework>netcoreapp2.2</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
<VersionSuffix></VersionSuffix>
|
||||
<IsPackable>true</IsPackable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="prefercliruntime">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>/</PackagePath>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace MSBuildTestApp
|
||||
{
|
||||
public class Program
|
||||
{
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
var message = Environment.GetEnvironmentVariable("ASPNETCORE_URLS");
|
||||
Console.WriteLine(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:49850/",
|
||||
"sslPort": 0
|
||||
}
|
||||
},
|
||||
"profiles": {
|
||||
"First": {
|
||||
"commandName": "Project",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||
"ASPNETCORE_URLS": "http://localhost:12345/"
|
||||
},
|
||||
"applicationUrl": "http://localhost:67890/"
|
||||
},
|
||||
"Second": {
|
||||
"commandName": "Project",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
},
|
||||
"applicationUrl": "http://localhost:54321/"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
|
||||
<RuntimeIdentifiers>$(LatestRuntimeIdentifiers)</RuntimeIdentifiers>
|
||||
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
|
||||
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace MSBuildTestApp
|
||||
{
|
||||
public class Program
|
||||
{
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
if (args.Length > 0)
|
||||
{
|
||||
Console.WriteLine("echo args:" + string.Join(";", args));
|
||||
}
|
||||
Console.WriteLine("Hello World!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
</Project>
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26006.2
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace ConsoleApplication
|
||||
{
|
||||
public class Program
|
||||
{
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
Console.WriteLine("Hello World!");
|
||||
|
||||
if (args.Length > 0)
|
||||
{
|
||||
for (int i = 0; i < args.Length; i++)
|
||||
{
|
||||
Console.WriteLine($"{i} = {args[i]}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
This directory is intentionally empty.
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
This directory is intentionally empty.
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
This directory is intentionally empty.
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26006.2
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
Foo Bar|Any CPU = Foo Bar|Any CPU
|
||||
Foo Bar|x64 = Foo Bar|x64
|
||||
Foo Bar|x86 = Foo Bar|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace ProjectWithAdditionalConfigs
|
||||
{
|
||||
public static class Library
|
||||
{
|
||||
public static string GetMessage()
|
||||
{
|
||||
return "Hello World!";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<ProjectGuid>{A302325B-D680-4C0E-8680-7AE283981624}</ProjectGuid>
|
||||
<Platforms>AnyCPU;x64;x86;AdditionalPlatform</Platforms>
|
||||
<Configurations>Debug;Release;FooBar;AdditionalConfiguration</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace ProjectWithMatchingConfigs
|
||||
{
|
||||
public static class Library
|
||||
{
|
||||
public static string GetMessage()
|
||||
{
|
||||
return "Hello World!";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<ProjectGuid>{C9601CA2-DB64-4FB6-B463-368C7764BF0D}</ProjectGuid>
|
||||
<Platforms>AnyCPU;x64;x86</Platforms>
|
||||
<Configurations>Debug;Release;FooBar</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace ProjectWithoutMatchingConfigs
|
||||
{
|
||||
public static class Library
|
||||
{
|
||||
public static string GetMessage()
|
||||
{
|
||||
return "Hello World!";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<ProjectGuid>{C49B64DE-4401-4825-8A88-10DCB5950E57}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27110.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App", "App\App.csproj", "{BB02B949-F6BD-4872-95CB-96A05B1FE026}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{4E952B56-841D-461D-89A9-7977DDCC0625} = {4E952B56-841D-461D-89A9-7977DDCC0625}
|
||||
{D53E177A-8ECF-43D5-A01E-98B884D53CA6} = {D53E177A-8ECF-43D5-A01E-98B884D53CA6}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "First", "First\First.csproj", "{D53E177A-8ECF-43D5-A01E-98B884D53CA6}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{4E952B56-841D-461D-89A9-7977DDCC0625} = {4E952B56-841D-461D-89A9-7977DDCC0625}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Second", "Second\Second.csproj", "{4E952B56-841D-461D-89A9-7977DDCC0625}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{BB02B949-F6BD-4872-95CB-96A05B1FE026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BB02B949-F6BD-4872-95CB-96A05B1FE026}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BB02B949-F6BD-4872-95CB-96A05B1FE026}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BB02B949-F6BD-4872-95CB-96A05B1FE026}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D53E177A-8ECF-43D5-A01E-98B884D53CA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D53E177A-8ECF-43D5-A01E-98B884D53CA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D53E177A-8ECF-43D5-A01E-98B884D53CA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D53E177A-8ECF-43D5-A01E-98B884D53CA6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{4E952B56-841D-461D-89A9-7977DDCC0625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4E952B56-841D-461D-89A9-7977DDCC0625}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4E952B56-841D-461D-89A9-7977DDCC0625}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4E952B56-841D-461D-89A9-7977DDCC0625}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {F6D9A973-1CFD-41C9-84F2-1471C0FE67DF}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
using System;
|
||||
|
||||
namespace App
|
||||
{
|
||||
class Program
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
Console.WriteLine("Hello World!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
using System;
|
||||
|
||||
namespace First
|
||||
{
|
||||
public class Class1
|
||||
{
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
using System;
|
||||
|
||||
namespace Second
|
||||
{
|
||||
public class Class1
|
||||
{
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
@page
|
||||
@model TestRazorApp.MyFeature.Pages.Page1Model
|
||||
@{
|
||||
Layout = null;
|
||||
}
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<meta name="viewport" content="width=device-width" />
|
||||
<title>Page1</title>
|
||||
</head>
|
||||
<body>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
|
||||
namespace TestRazorApp.MyFeature.Pages
|
||||
{
|
||||
public class Page1Model : PageModel
|
||||
{
|
||||
public void OnGet()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.Razor">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
|
||||
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<FrameworkReference Include="Microsoft.AspNetCore.App" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project Sdk="Microsoft.Docker.Sdk">
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectVersion>2.0</ProjectVersion>
|
||||
<DockerTargetOS>Linux</DockerTargetOS>
|
||||
<DockerLaunchAction>LaunchBrowser</DockerLaunchAction>
|
||||
<DockerServiceUrl>http://localhost:{ServicePort}</DockerServiceUrl>
|
||||
<DockerServiceName>testwebapplication</DockerServiceName>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Include="docker-compose.yml" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
version: '3.0'
|
||||
|
||||
services:
|
||||
testwebapplication:
|
||||
image: testwebapplication
|
||||
build:
|
||||
context: .
|
||||
dockerfile: testwebapplication/Dockerfile
|
||||
|
|
@ -20,6 +20,6 @@ The unit tests are located in:
|
|||
The integration tests are located [here](https://github.com/dotnet/sdk/tree/main/test/dotnet-new.Tests).
|
||||
Please follow existing tests to see how to run `dotnet new` under different conditions.
|
||||
|
||||
Assets for unit and integration tests are defined [here](https://github.com/dotnet/sdk/tree/main/src/Assets/TestPackages/dotnet-new).
|
||||
Assets for unit and integration tests are defined [here](https://github.com/dotnet/sdk/tree/main/test/TestAssets/TestPackages/dotnet-new).
|
||||
|
||||
To work with `dotnet new`, you may also use [solution filter](https://github.com/dotnet/sdk/blob/main/TemplateEngine.slnf).
|
||||
|
|
@ -122,8 +122,8 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<WorkloadManifestContent Include="$(RepoRoot)\src\Assets\TestWorkloads\manifests\**\*.*" />
|
||||
<WorkloadPackContent Include="$(RepoRoot)\src\Assets\TestWorkloads\packs\**\*.*" />
|
||||
<WorkloadManifestContent Include="$(RepoRoot)\test\TestAssets\TestWorkloads\manifests\**\*.*" />
|
||||
<WorkloadPackContent Include="$(RepoRoot)\test\TestAssets\TestWorkloads\packs\**\*.*" />
|
||||
</ItemGroup>
|
||||
|
||||
<Copy SourceFiles="@(WorkloadManifestContent)"
|
||||
|
|
|
|||
|
|
@ -112,10 +112,10 @@ src/runtime/src/**/tests/**/*.res
|
|||
src/runtime/src/**/tests/**/*.resources
|
||||
|
||||
# sdk
|
||||
src/sdk/src/Assets/TestProjects/**/*.dat
|
||||
src/sdk/src/Assets/TestProjects/**/*.cache
|
||||
src/sdk/src/Assets/TestProjects/**/*.tlb
|
||||
src/sdk/src/Assets/TestPackages/dotnet-new/nupkg_templates/*
|
||||
src/sdk/test/TestAssets/TestProjects/**/*.dat
|
||||
src/sdk/test/TestAssets/TestProjects/**/*.cache
|
||||
src/sdk/test/TestAssets/TestProjects/**/*.tlb
|
||||
src/sdk/test/TestAssets/TestPackages/dotnet-new/nupkg_templates/*
|
||||
src/sdk/test/Microsoft.DotNet.ShellShim.Tests/WpfBinaryTestAsssets/*.dll
|
||||
src/sdk/test/Microsoft.NET.Sdk.Publish.Tasks.Tests/Resources/*.zip
|
||||
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
|
||||
|
||||
<!-- Note: These items are showing up in solution explorer even though Visible is set to false -->
|
||||
<None Include="$(MSBuildThisFileDirectory)..\src\Assets\**\*.*" Exclude="$(MSBuildThisFileDirectory)..\src\Assets\TestPackages\dotnet-new\**\*" CopyToPublishDirectory="PreserveNewest"
|
||||
LinkBase="Assets" Visible="false" />
|
||||
<None Include="$(MSBuildThisFileDirectory)TestAssets\**\*.*" Exclude="$(MSBuildThisFileDirectory)TestAssets\TestPackages\dotnet-new\**\*" CopyToPublishDirectory="PreserveNewest"
|
||||
LinkBase="TestAssets" Visible="false" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="TestAsTool" DependsOnTargets="Pack;_InnerGetTestsToRun">
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
<Target Name="SetupTestPackageProjectBaseData">
|
||||
<ItemGroup>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/PackageWithFakeNativeDep"
|
||||
<BaseTestPackageProject Include="PackageWithFakeNativeDep"
|
||||
Condition="$([MSBuild]::IsOSPlatform(`Windows`))" >
|
||||
<Name>PackageWithFakeNativeDep</Name>
|
||||
<ProjectName>PackageWithFakeNativeDep.csproj</ProjectName>
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
<Version>1.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/dotnet-dependency-context-test">
|
||||
<BaseTestPackageProject Include="dotnet-dependency-context-test">
|
||||
<Name>dotnet-dependency-context-test</Name>
|
||||
<ProjectName>dotnet-dependency-context-test.csproj</ProjectName>
|
||||
<IsTool>True</IsTool>
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
<Version>$(Version)</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello">
|
||||
<BaseTestPackageProject Include="dotnet-hello/v1/dotnet-hello">
|
||||
<Name>dotnet-hello</Name>
|
||||
<ProjectName>dotnet-hello.csproj</ProjectName>
|
||||
<IsTool>True</IsTool>
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
<Version>1.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello">
|
||||
<BaseTestPackageProject Include="dotnet-hello/v2/dotnet-hello">
|
||||
<Name>dotnet-hello</Name>
|
||||
<ProjectName>dotnet-hello.csproj</ProjectName>
|
||||
<IsTool>True</IsTool>
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
<Version>2.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0">
|
||||
<BaseTestPackageProject Include="dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0">
|
||||
<Name>dotnet-outputsframeworkversion-netcoreapp1.0</Name>
|
||||
<ProjectName>dotnet-outputsframeworkversion-netcoreapp1.0.csproj</ProjectName>
|
||||
<IsTool>True</IsTool>
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
<Version>1.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/dotnet-portable">
|
||||
<BaseTestPackageProject Include="dotnet-portable">
|
||||
<Name>dotnet-portable</Name>
|
||||
<ProjectName>dotnet-portable.csproj</ProjectName>
|
||||
<IsTool>True</IsTool>
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
<Version>1.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/dotnet-portable-v1">
|
||||
<BaseTestPackageProject Include="dotnet-portable-v1">
|
||||
<Name>dotnet-portable</Name>
|
||||
<ProjectName>dotnet-portable-v1.csproj</ProjectName>
|
||||
<IsTool>True</IsTool>
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
<Version>1.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/dotnet-portable-v1-prefercli">
|
||||
<BaseTestPackageProject Include="dotnet-portable-v1-prefercli">
|
||||
<Name>dotnet-portable</Name>
|
||||
<ProjectName>dotnet-portable-v1-prefercli.csproj</ProjectName>
|
||||
<IsTool>True</IsTool>
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<Version>1.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/dotnet-fallbackfoldertool">
|
||||
<BaseTestPackageProject Include="dotnet-fallbackfoldertool">
|
||||
<Name>dotnet-fallbackfoldertool</Name>
|
||||
<ProjectName>dotnet-fallbackfoldertool.csproj</ProjectName>
|
||||
<IsTool>True</IsTool>
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
<Version>1.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/dotnet-prefercliruntime">
|
||||
<BaseTestPackageProject Include="dotnet-prefercliruntime">
|
||||
<Name>dotnet-prefercliruntime</Name>
|
||||
<ProjectName>dotnet-prefercliruntime.csproj</ProjectName>
|
||||
<IsTool>True</IsTool>
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
<Version>1.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/ToolWithOutputName">
|
||||
<BaseTestPackageProject Include="ToolWithOutputName">
|
||||
<Name>dotnet-tool-with-output-name</Name>
|
||||
<ProjectName>ToolWithOutputName.csproj</ProjectName>
|
||||
<NuPkgName>ToolWithOutputName</NuPkgName>
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
<Version>1.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/Library.ContainsAnalyzer">
|
||||
<BaseTestPackageProject Include="Library.ContainsAnalyzer">
|
||||
<Name>Library.ContainsAnalyzer</Name>
|
||||
<ProjectName>Library.ContainsAnalyzer.csproj</ProjectName>
|
||||
<NuPkgName>Library.ContainsAnalyzer</NuPkgName>
|
||||
|
|
@ -146,7 +146,7 @@
|
|||
<Version>1.0.0</Version>
|
||||
<Clean>True</Clean>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Assets/TestPackages/Library.ContainsAnalyzer2">
|
||||
<BaseTestPackageProject Include="Library.ContainsAnalyzer2">
|
||||
<Name>Library.ContainsAnalyzer2</Name>
|
||||
<ProjectName>Library.ContainsAnalyzer2.csproj</ProjectName>
|
||||
<NuPkgName>Library.ContainsAnalyzer2</NuPkgName>
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
</BaseTestPackageProject>
|
||||
|
||||
<BaseTestPackageProject>
|
||||
<ProjectDir>$(RepoRoot)%(Identity)/</ProjectDir>
|
||||
<ProjectDir>$(RepoRoot)test/TestAssets/TestPackages/%(Identity)/</ProjectDir>
|
||||
<PackageOutput>$(TestPackagesDir)/%(NuPkgName).%(Version).nupkg</PackageOutput>
|
||||
</BaseTestPackageProject>
|
||||
|
||||
|
|
|
|||
|
|
@ -88,10 +88,10 @@ namespace Microsoft.NET.TestFramework
|
|||
TestContext testContext = new();
|
||||
|
||||
bool runAsTool = false;
|
||||
if (Directory.Exists(Path.Combine(AppContext.BaseDirectory, "Assets")))
|
||||
if (Directory.Exists(Path.Combine(AppContext.BaseDirectory, "TestAssets")))
|
||||
{
|
||||
runAsTool = true;
|
||||
testContext.TestAssetsDirectory = Path.Combine(AppContext.BaseDirectory, "Assets");
|
||||
testContext.TestAssetsDirectory = Path.Combine(AppContext.BaseDirectory, "TestAssets");
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_SDK_TEST_AS_TOOL")))
|
||||
{
|
||||
|
|
@ -100,7 +100,7 @@ namespace Microsoft.NET.TestFramework
|
|||
// variable instead of packing the test, and installing it as a global tool.
|
||||
runAsTool = true;
|
||||
|
||||
testContext.TestAssetsDirectory = FindFolderInTree(Path.Combine("src", "Assets"), AppContext.BaseDirectory);
|
||||
testContext.TestAssetsDirectory = FindFolderInTree(Path.Combine("test", "TestAssets"), AppContext.BaseDirectory);
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_SDK_TEST_ASSETS_DIRECTORY")))
|
||||
{
|
||||
|
|
@ -121,12 +121,6 @@ namespace Microsoft.NET.TestFramework
|
|||
else if (!commandLine.NoRepoInference && !runAsTool)
|
||||
{
|
||||
repoRoot = GetRepoRoot();
|
||||
|
||||
//if (repoRoot != null)
|
||||
//{
|
||||
// // assumes tests are always executed from the "artifacts/bin/Tests/$MSBuildProjectFile/$Configuration" directory
|
||||
// repoConfiguration = new DirectoryInfo(AppContext.BaseDirectory).Name;
|
||||
//}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(commandLine.TestExecutionDirectory))
|
||||
|
|
@ -145,7 +139,7 @@ namespace Microsoft.NET.TestFramework
|
|||
{
|
||||
testContext.TestExecutionDirectory = (Path.Combine(FindFolderInTree("artifacts", AppContext.BaseDirectory), "tmp", repoConfiguration));
|
||||
|
||||
testContext.TestAssetsDirectory = FindFolderInTree(Path.Combine("src", "Assets"), AppContext.BaseDirectory);
|
||||
testContext.TestAssetsDirectory = FindFolderInTree(Path.Combine("test", "TestAssets"), AppContext.BaseDirectory);
|
||||
}
|
||||
|
||||
Directory.CreateDirectory(testContext.TestExecutionDirectory);
|
||||
|
|
@ -190,7 +184,6 @@ namespace Microsoft.NET.TestFramework
|
|||
var nugetFolder = FindFolderInTree(".nuget", AppContext.BaseDirectory, false)
|
||||
?? Path.Combine(testContext.TestExecutionDirectory, ".nuget");
|
||||
|
||||
|
||||
testContext.NuGetFallbackFolder = Path.Combine(nugetFolder, "NuGetFallbackFolder");
|
||||
testContext.NuGetExePath = Path.Combine(nugetFolder, $"nuget{Constants.ExeSuffix}");
|
||||
testContext.NuGetCachePath = Path.Combine(nugetFolder, "packages");
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
|
||||
<TargetFrameworks>$(CurrentTargetFramework);net462</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net461</TargetFramework>
|
||||
<TargetFramework>net462</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ namespace TestLibrary
|
|||
public static class Helper
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets the message from the helper. This comment is here to help test XML documentation file generation, please do not remove it.
|
||||
/// Gets the message from the helper. This comment is here to help test XML documentation file generation, do not remove it.
|
||||
/// </summary>
|
||||
/// <returns>A message</returns>
|
||||
public static string GetMessage()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
<!-- Prevent test asset projects from picking up the repo's root Directory.Build.props. -->
|
||||
<Project>
|
||||
<!-- A copied Directory.Build.props file to prevent test asset projects from picking up the repo's Directory.Build.props' -->
|
||||
|
||||
<PropertyGroup>
|
||||
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
|
||||
<CheckEolTargetFramework>false</CheckEolTargetFramework>
|
||||
<DefaultItemExcludes>$(DefaultItemExcludes);**/*.tmp</DefaultItemExcludes>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<!-- Prevent test asset projects from picking up the repo's root Directory.Build.targets. -->
|
||||
<Project>
|
||||
<!-- Empty Directory.Build.targets file to prevent test asset projects from picking up the repo's Directory.Build.props' -->
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче