Get tests and skeleton build tasks building
This commit is contained in:
Daniel Plaisted
parent
8d2eff7884
commit
914f465b30
17 changed files with 202 additions and 1933 deletions
|
|
@ -12,5 +12,6 @@
|
|||
<DebugSymbols>true</DebugSymbols>
|
||||
|
||||
<IsShipping>true</IsShipping>
|
||||
<CoreSdkTargetFramework>netcoreapp3.0</CoreSdkTargetFramework>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
143
Microsoft.DotNet.Cli.sln
Normal file
143
Microsoft.DotNet.Cli.sln
Normal file
|
|
@ -0,0 +1,143 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27130.2020
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\redist\redist.csproj", "{098D9321-1201-4974-A75E-F58EBCD98ACF}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndToEnd.Tests", "test\EndToEnd\EndToEnd.Tests.csproj", "{1BFF54F9-4E35-49DB-893C-AF2047722FC6}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{48E260F4-6F3F-4387-B61F-D15BABD06D9A}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks", "src\core-sdk-tasks\core-sdk-tasks.csproj", "{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
MinSizeRel|Any CPU = MinSizeRel|Any CPU
|
||||
MinSizeRel|x64 = MinSizeRel|x64
|
||||
MinSizeRel|x86 = MinSizeRel|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
RelWithDebInfo|Any CPU = RelWithDebInfo|Any CPU
|
||||
RelWithDebInfo|x64 = RelWithDebInfo|x64
|
||||
RelWithDebInfo|x86 = RelWithDebInfo|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|x64.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|x64.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|x86.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|x86.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|x64.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|x64.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|x86.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|x86.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|x64.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|x86.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|x64.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|x64.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|x86.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|x86.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|x64.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|x64.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|x86.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|x86.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|x64.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|x86.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Debug|x64.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Debug|x64.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Debug|x86.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Debug|x86.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.MinSizeRel|x64.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.MinSizeRel|x64.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.MinSizeRel|x86.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.MinSizeRel|x86.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Release|x64.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.Release|x86.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|x64.Build.0 = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|x86.Build.0 = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
|
||||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
|
||||
{48E260F4-6F3F-4387-B61F-D15BABD06D9A} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -29,9 +29,6 @@
|
|||
<NUnit3TemplatesVersion>1.5.1</NUnit3TemplatesVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- NOTE: The property group above is in alignment with orchestrated build version naming conventions. -->
|
||||
<Import Condition=" Exists('$(OrchestratedPackageVersionsProps)') " Project="$(OrchestratedPackageVersionsProps)" />
|
||||
|
||||
<PropertyGroup>
|
||||
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</CLI_NETStandardLibraryNETFrameworkVersion>
|
||||
|
||||
|
|
@ -48,6 +45,15 @@
|
|||
<BuildTasksFeedToolVersion>2.1.0-prerelease-02430-04</BuildTasksFeedToolVersion>
|
||||
<VersionToolsVersion>$(BuildTasksFeedToolVersion)</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>15.8.0</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<RestoreSources>
|
||||
$(RestoreSources);
|
||||
https://dotnet.myget.org/F/msbuild/api/v3/index.json;
|
||||
https://dotnet.myget.org/F/nuget-build/api/v3/index.json;
|
||||
</RestoreSources>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -21,7 +21,11 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
|
||||
public override bool Execute()
|
||||
{
|
||||
FS.Mkdirp(Path.GetDirectoryName(DestinationPath));
|
||||
string destinationDir = Path.GetDirectoryName(DestinationPath);
|
||||
if (!Directory.Exists(destinationDir))
|
||||
{
|
||||
Directory.CreateDirectory(destinationDir);
|
||||
}
|
||||
|
||||
if (File.Exists(DestinationPath) && !Overwrite)
|
||||
{
|
||||
10
src/core-sdk-tasks/core-sdk-tasks.csproj
Normal file
10
src/core-sdk-tasks/core-sdk-tasks.csproj
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Build" Version="15.7.177" />
|
||||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.177" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,275 +1,9 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" />
|
||||
<Import Project="$(RepoRoot)/build/compile/LzmaArchive.targets" />
|
||||
<Import Project="$(RepoRoot)/build/MSBuildExtensions.targets" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(CliTargetFramework)</TargetFramework>
|
||||
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
|
||||
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
|
||||
<AssetTargetFallback>dotnet5.4</AssetTargetFallback>
|
||||
<PublishDir>$(SdkOutputDirectory)</PublishDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="DoComposeSdk"
|
||||
DependsOnTargets="PrepareOutputDirectory;
|
||||
PublishRuntimes;
|
||||
PublishToolset;
|
||||
PublishTemplates;
|
||||
PublishLzmaArchive;
|
||||
CrossgenPublishDir;
|
||||
PublishDotnetTools;
|
||||
PublishVersionFile;
|
||||
PublishAppHostTemplate;
|
||||
RetargetTools;
|
||||
GenerateMSBuildExtensions"
|
||||
AfterTargets="Publish" />
|
||||
|
||||
<Target Name="PrepareOutputDirectory">
|
||||
<RemoveDir Directories="$(OutputDirectory)" />
|
||||
<MakeDir Directories="$(OutputDirectory)"/>
|
||||
</Target>
|
||||
|
||||
<Target Name="PublishRuntimes">
|
||||
<ItemGroup>
|
||||
<SharedFramework Remove="*" />
|
||||
<SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
|
||||
<SharedFramework Include="$(AspNetCoreSharedFxPublishDirectory)/**/*" />
|
||||
<SharedFramework Include="$(WinFormsAndWpfSharedFxPublishDirectory)/**/*" />
|
||||
</ItemGroup>
|
||||
|
||||
<Copy SourceFiles="@(SharedFramework)"
|
||||
DestinationFiles="@(SharedFramework->'$(OutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
</Target>
|
||||
|
||||
<Target Name="PublishToolset">
|
||||
<ItemGroup>
|
||||
<Toolset Remove="*" />
|
||||
<Toolset Include="$(ToolsetPublishDirectory)/**/*" />
|
||||
|
||||
<!-- Workaround for https://github.com/dotnet/toolset/issues/8 -->
|
||||
<Toolset Remove="$(ToolsetPublishDirectory)/ref/**/*"/>
|
||||
</ItemGroup>
|
||||
|
||||
<Copy SourceFiles="@(Toolset)"
|
||||
DestinationFiles="@(Toolset->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
</Target>
|
||||
|
||||
<Target Name="PublishDotnetTools"
|
||||
Condition="'$(CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS)' != 'true'"
|
||||
AfterTargets="Publish">
|
||||
<ItemGroup>
|
||||
<DotnetToolsToBundle Include="$(RepoRoot)/build/BundledDotnetTools.proj">
|
||||
<Properties>
|
||||
DotnetToolsLayoutDirectory=$(SdkOutputDirectory)/DotnetTools;
|
||||
TemplateFillInPackageName=%(BundledDotnetTools.Identity);
|
||||
TemplateFillInPackageVersion=%(BundledDotnetTools.Version);
|
||||
PreviousStageDirectory=$(PreviousStageDirectory)
|
||||
</Properties>
|
||||
</DotnetToolsToBundle>
|
||||
</ItemGroup>
|
||||
|
||||
<MSBuild
|
||||
BuildInParallel="False"
|
||||
Projects="@(DotnetToolsToBundle)">
|
||||
</MSBuild>
|
||||
</Target>
|
||||
|
||||
<Target Name="PublishAppHostTemplate" DependsOnTargets="RunResolvePackageDependencies">
|
||||
|
||||
<PropertyGroup>
|
||||
<NETCoreDotNetAppHostPackageName>Microsoft.NETCore.DotNetAppHost</NETCoreDotNetAppHostPackageName>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<NETCoreDotNetAppHostPackageVersions Include="@(PackageDefinitions->'%(Version)')"
|
||||
Condition="%(PackageDefinitions.Name) == $(NETCoreDotNetAppHostPackageName)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Error Condition="@(NETCoreDotNetAppHostPackageVersions->Distinct()->Count()) != 1"
|
||||
Text="Failed to determine the $(NETCoreDotNetAppHostPackageName) version pulled in Microsoft.NETCore.App" />
|
||||
|
||||
<PropertyGroup>
|
||||
<_NETCoreDotNetAppHostPackageVersion>@(NETCoreDotNetAppHostPackageVersions->Distinct())</_NETCoreDotNetAppHostPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<AppHostTemplate Include="$(RepoRoot)/build/AppHostTemplate.proj">
|
||||
<Properties>
|
||||
AppHostTemplatePath=$(SdkOutputDirectory)/AppHostTemplate;
|
||||
TemplateFillInPackageName=$(NETCoreDotNetAppHostPackageName);
|
||||
TemplateFillInPackageVersion=$(_NETCoreDotNetAppHostPackageVersion);
|
||||
PreviousStageDirectory=$(PreviousStageDirectory);
|
||||
AppHostIntermediateDirectory=$(IntermediateDirectory)/AppHostIntermediate
|
||||
</Properties>
|
||||
</AppHostTemplate>
|
||||
</ItemGroup>
|
||||
|
||||
<MSBuild
|
||||
BuildInParallel="False"
|
||||
Projects="@(AppHostTemplate)">
|
||||
</MSBuild>
|
||||
|
||||
</Target>
|
||||
|
||||
<Target Name="PublishVersionFile">
|
||||
<WriteLinesToFile File="$(PublishDir)/.version"
|
||||
Lines="$(CommitHash);$(SdkVersion);$(Rid)"
|
||||
Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="CrossgenPublishDir"
|
||||
Condition="'$(DISABLE_CROSSGEN)' == ''"
|
||||
AfterTargets="PublishSdks">
|
||||
<ItemGroup>
|
||||
<RoslynFiles Include="$(PublishDir)Roslyn\bincore\**\*" />
|
||||
<FSharpFiles Include="$(PublishDir)FSharp\**\*" Exclude="$(PublishDir)FSharp\FSharp.Build.dll" />
|
||||
<RemainingFiles Include="$(PublishDir)**\*" Exclude="@(RoslynFiles);@(FSharpFiles)" />
|
||||
|
||||
<!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
|
||||
<RemainingFiles Remove="$(PublishDir)TestHost*\**\*" />
|
||||
<RemainingFiles Remove="$(PublishDir)Sdks\**\*" />
|
||||
<RemainingFiles Remove="$(PublishDir)**\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
|
||||
|
||||
<!-- Add back the .NET Core assemblies in the Sdks folder -->
|
||||
<RemainingFiles Include="$(PublishDir)Sdks\Microsoft.NET.Sdk\tools\netcoreapp2.0\**\*" />
|
||||
<RemainingFiles Include="$(PublishDir)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\**\*" />
|
||||
|
||||
<!-- Don't try to CrossGen .NET Framework support assemblies for .NET Standard -->
|
||||
<RemainingFiles Remove="$(PublishDir)Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />
|
||||
|
||||
<!-- Don't crossgen satellite assemblies -->
|
||||
<RoslynFiles Remove="$(PublishDir)Roslyn\bincore\**\*.resources.dll" />
|
||||
<FSharpFiles Remove="$(PublishDir)FSharp\**\*.resources.dll" />
|
||||
<RemainingFiles Remove="$(PublishDir)**\*.resources.dll" />
|
||||
|
||||
<DiasymReaderPath Include="$(SharedFrameworkNameVersionPath)/Microsoft.DiaSymReader.Native.*.dll" />
|
||||
</ItemGroup>
|
||||
|
||||
<AddMetadataIsPE Items="@(RoslynFiles)">
|
||||
<Output TaskParameter="ResultItems" ItemName="RoslynFilesWithPEMarker" />
|
||||
</AddMetadataIsPE>
|
||||
<AddMetadataIsPE Items="@(FSharpFiles)">
|
||||
<Output TaskParameter="ResultItems" ItemName="FSharpFilesWithPEMarker" />
|
||||
</AddMetadataIsPE>
|
||||
<AddMetadataIsPE Items="@(RemainingFiles)">
|
||||
<Output TaskParameter="ResultItems" ItemName="RemainingFilesWithPEMarker" />
|
||||
</AddMetadataIsPE>
|
||||
|
||||
<ItemGroup>
|
||||
<RoslynTargets Include="%(RoslynFilesWithPEMarker.FullPath)" Condition=" '%(RoslynFilesWithPEMarker.IsPE)' == 'True' " />
|
||||
<FSharpTargets Include="%(FSharpFilesWithPEMarker.FullPath)" Condition=" '%(FSharpFilesWithPEMarker.IsPE)' == 'True' " />
|
||||
<RemainingTargets Include="%(RemainingFilesWithPEMarker.FullPath)" Condition=" '%(RemainingFilesWithPEMarker.IsPE)' == 'True' " />
|
||||
|
||||
<RoslynFolders Include="@(RoslynTargets->DirectoryName()->Distinct())" />
|
||||
<FSharpFolders Include="@(FSharpTargets->DirectoryName()->Distinct())" />
|
||||
<RemainingFolders Include="@(RemainingTargets->DirectoryName()->Distinct())" />
|
||||
|
||||
<!-- FSharp.Build.dll causes the FSharp folder to be included. Remove it, as we don't want other FSharp dlls being included in the crossgen. -->
|
||||
<RemainingFolders Remove="$(PublishDir)FSharp\**\*" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Ensure crossgen tool is executable. See https://github.com/NuGet/Home/issues/4424 -->
|
||||
<Chmod Condition=" '$(OSName)' != 'win' "
|
||||
Glob="$(CrossgenPath)"
|
||||
Mode="u+x" />
|
||||
|
||||
<!-- Crossgen does not support generating symbols on Mac -->
|
||||
<PropertyGroup Condition="'$(CreateCrossgenSymbols)' == ''">
|
||||
<CreateCrossgenSymbols>true</CreateCrossgenSymbols>
|
||||
<CreateCrossgenSymbols Condition="'$(OSName)' == 'osx'">false</CreateCrossgenSymbols>
|
||||
</PropertyGroup>
|
||||
|
||||
<Crossgen
|
||||
SourceAssembly="%(RoslynTargets.FullPath)"
|
||||
DestinationPath="%(RoslynTargets.FullPath)"
|
||||
JITPath="$(LibCLRJitPath)"
|
||||
CrossgenPath="$(CrossgenPath)"
|
||||
ReadyToRun="True"
|
||||
CreateSymbols="$(CreateCrossgenSymbols)"
|
||||
DiasymReaderPath="@(DiasymReaderPath)"
|
||||
PlatformAssemblyPaths="@(PlatformAssemblies);@(RoslynFolders);$(SharedFrameworkNameVersionPath)" />
|
||||
|
||||
<Crossgen
|
||||
SourceAssembly="%(FSharpTargets.FullPath)"
|
||||
DestinationPath="%(FSharpTargets.FullPath)"
|
||||
JITPath="$(LibCLRJitPath)"
|
||||
CrossgenPath="$(CrossgenPath)"
|
||||
ReadyToRun="True"
|
||||
CreateSymbols="$(CreateCrossgenSymbols)"
|
||||
DiasymReaderPath="@(DiasymReaderPath)"
|
||||
PlatformAssemblyPaths="@(PlatformAssemblies);@(FSharpFolders);$(SharedFrameworkNameVersionPath)" />
|
||||
|
||||
<Crossgen
|
||||
SourceAssembly="%(RemainingTargets.FullPath)"
|
||||
DestinationPath="%(RemainingTargets.FullPath)"
|
||||
JITPath="$(LibCLRJitPath)"
|
||||
CrossgenPath="$(CrossgenPath)"
|
||||
ReadyToRun="True"
|
||||
CreateSymbols="$(CreateCrossgenSymbols)"
|
||||
DiasymReaderPath="@(DiasymReaderPath)"
|
||||
PlatformAssemblyPaths="@(PlatformAssemblies);@(RemainingFolders);$(SharedFrameworkNameVersionPath)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="ChmodPublishDir"
|
||||
AfterTargets="CrossgenPublishDir"
|
||||
Condition=" '$(OSName)' != 'win' ">
|
||||
|
||||
<Exec Command="find $(SdkOutputDirectory) -type d -exec chmod 755 {} \;" />
|
||||
<Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" />
|
||||
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" />
|
||||
</Target>
|
||||
|
||||
<Target Name="SeparateSymbolsFromPublishDir"
|
||||
AfterTargets="CrossgenPublishDir">
|
||||
<ItemGroup>
|
||||
<PdbsToMove Include="$(PublishDir)/**/*.pdb" />
|
||||
<PdbsToMove Include="$(PublishDir)/**/*.ni.*.map" />
|
||||
</ItemGroup>
|
||||
|
||||
<Move SourceFiles="@(PdbsToMove)"
|
||||
DestinationFiles="@(PdbsToMove->'$(SymbolsDirectory)/sdk/$(SdkVersion)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
</Target>
|
||||
|
||||
<Target Name="PublishTemplates">
|
||||
<ItemGroup>
|
||||
<TemplatesToBundle Include="$(RepoRoot)/build/BundledTemplates.proj">
|
||||
<Properties>
|
||||
TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
|
||||
TemplateFillInPackageName=%(BundledTemplate.Identity);
|
||||
TemplateFillInPackageVersion=%(BundledTemplate.Version);
|
||||
PreviousStageDirectory=$(PreviousStageDirectory)
|
||||
</Properties>
|
||||
</TemplatesToBundle>
|
||||
</ItemGroup>
|
||||
|
||||
<MSBuild
|
||||
BuildInParallel="False"
|
||||
Projects="@(TemplatesToBundle)">
|
||||
</MSBuild>
|
||||
</Target>
|
||||
|
||||
<Target Name="PublishLzmaArchive"
|
||||
Condition="'$(CLIBUILD_SKIP_LZMA)' != 'true'"
|
||||
DependsOnTargets="GetNuGetPackagesArchive">
|
||||
</Target>
|
||||
|
||||
<Target Name="RetargetTools">
|
||||
<PropertyGroup>
|
||||
<ReplacementPattern>"version": ".*"</ReplacementPattern>
|
||||
<ReplacementString>"version": "$(MicrosoftNETCoreAppPackageVersion)"</ReplacementString>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ToolRuntimeConfigPath Include="$(PublishDir)/**/*.runtimeconfig.json" />
|
||||
</ItemGroup>
|
||||
<ReplaceFileContents
|
||||
InputFiles="@(ToolRuntimeConfigPath)"
|
||||
DestinationFiles="@(ToolRuntimeConfigPath)"
|
||||
ReplacementPatterns="$(ReplacementPattern)"
|
||||
ReplacementStrings="$(ReplacementString)" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\Directory.Build.props" />
|
||||
<Import Project="..\build\TestDependencyVersions.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
|
||||
</PropertyGroup>
|
||||
<Import Project="..\eng\TestVersions.props" />
|
||||
</Project>
|
||||
|
|
|
|||
22
test/EndToEnd/EndToEnd.Tests.csproj
Normal file
22
test/EndToEnd/EndToEnd.Tests.csproj
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- <Content Include="..\..\artifacts\*\stage2\sdk\*\.version">
|
||||
<Link>.version</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content> -->
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
|
||||
<PackageReference Include="xunit" Version="2.2.0" /> -->
|
||||
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(CliTargetFramework)</TargetFramework>
|
||||
<RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
|
||||
<AssemblyName>EndToEnd</AssemblyName>
|
||||
<OutputType>Exe</OutputType>
|
||||
<AssetTargetFallback>$(AssetTargetFallback);dotnet5.4;portable-net451+win8</AssetTargetFallback>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="..\..\artifacts\*\stage2\sdk\*\.version">
|
||||
<Link>.version</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
|
||||
<PackageReference Include="xunit" Version="2.2.0" />
|
||||
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -36,7 +36,7 @@ namespace EndToEnd
|
|||
ItDoesNotRollForwardToTheLatestVersion(GivenSelfContainedAppsRollForward.AspNetCoreAllPackageName, minorVersion);
|
||||
}
|
||||
|
||||
public void ItDoesNotRollForwardToTheLatestVersion(string packageName, string minorVersion)
|
||||
internal void ItDoesNotRollForwardToTheLatestVersion(string packageName, string minorVersion)
|
||||
{
|
||||
var _testInstance = TestAssets.Get("TestAppSimple")
|
||||
.CreateInstance(identifier: packageName + "_" + minorVersion)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ namespace EndToEnd
|
|||
ItRollsForwardToTheLatestVersion(AspNetCoreAllPackageName, minorVersion);
|
||||
}
|
||||
|
||||
public void ItRollsForwardToTheLatestVersion(string packageName, string minorVersion)
|
||||
internal void ItRollsForwardToTheLatestVersion(string packageName, string minorVersion)
|
||||
{
|
||||
var _testInstance = TestAssets.Get("TestAppSimple")
|
||||
.CreateInstance(identifier: packageName + "_" + minorVersion)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<PropertyGroup>
|
||||
<Description>Microsoft.DotNet.TestFramework Class Library</Description>
|
||||
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
||||
<NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
|
||||
|
||||
<!-- Use this key because that's what Microsoft.DotNet.Cli.Utils is using for InternalsVisibleTo-->
|
||||
<AssemblyOriginatorKeyFile>$(RepoRoot)eng\Key.snk</AssemblyOriginatorKeyFile>
|
||||
|
||||
<!-- Stop the arcade SDK from overriding the key -->
|
||||
<StrongNameKeyId>Custom</StrongNameKeyId>
|
||||
<PublicKey>0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb</PublicKey>
|
||||
<PublicKeyToken>adb9793829ddae60</PublicKeyToken>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,6 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Description>Microsoft.DotNet.Tools.Tests.Utilities Class Library</Description>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<AssemblyName>Microsoft.DotNet.Tools.Tests.Utilities</AssemblyName>
|
||||
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
||||
<AssetTargetFallback>$(AssetTargetFallback);dotnet5.4;portable-net451+win8</AssetTargetFallback>
|
||||
<NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
<RunSettings>
|
||||
<DataCollectionRunSettings>
|
||||
<DataCollectors>
|
||||
<DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0">
|
||||
<Configuration>
|
||||
<CodeCoverage>
|
||||
<!-- Match assembly file paths: -->
|
||||
<ModulePaths>
|
||||
<Exclude>
|
||||
<ModulePath>.*Test.dll</ModulePath>
|
||||
</Exclude>
|
||||
</ModulePaths>
|
||||
|
||||
<!-- We recommend you do not change the following values: -->
|
||||
<UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>
|
||||
<AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>
|
||||
<CollectFromChildProcesses>True</CollectFromChildProcesses>
|
||||
<CollectAspDotNet>False</CollectAspDotNet>
|
||||
|
||||
</CodeCoverage>
|
||||
</Configuration>
|
||||
</DataCollector>
|
||||
</DataCollectors>
|
||||
</DataCollectionRunSettings>
|
||||
</RunSettings>
|
||||
Loading…
Reference in a new issue