Merge branch 'master' into merges/release/3.0.1xx-to-master
This commit is contained in:
Nick Guerrera
commit
18101b4d6c
29 changed files with 207 additions and 165 deletions
|
|
@ -1,11 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
|
||||
|
||||
<PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''">
|
||||
<Copyright>$(CopyrightNetFoundation)</Copyright>
|
||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
|
||||
<DebugType>embedded</DebugType>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27130.2020
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.28603.18
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}"
|
||||
EndProject
|
||||
|
|
@ -15,118 +15,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks", "src\core-
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{78E15EC1-7732-41E3-8591-934E9F583254}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\SdkResolver\SdkResolver.csproj", "{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}"
|
||||
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
|
||||
{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
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|x86.Build.0 = Debug|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Release|x64.Build.0 = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.Release|x86.Build.0 = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
|
||||
{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -136,6 +52,7 @@ Global
|
|||
{1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
|
||||
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
|
||||
{78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
|
||||
{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5}
|
||||
|
|
|
|||
|
|
@ -2,39 +2,43 @@
|
|||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<!-- Winforms / WPF -->
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview3-27420-40">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview4-27422-21">
|
||||
<Uri>https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted</Uri>
|
||||
<Sha>6808ad852c63ca765088873b0f88bafcbb7bb7fd</Sha>
|
||||
<Sha>cec5867556ba6778f958f0600a92d3728acc19cc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview3-27422-6">
|
||||
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27421-3">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>cc146b444df76e62d606f3431ff954b0cc112f92</Sha>
|
||||
<Sha>c38cd49ad5eee02e20e7e76dadac6b51cff035fb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App" Version="3.0.0-preview3-19122-14">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>e65004907a633a21e7e93b1c00e3944ffb10d8f8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-ef" Version="3.0.0-preview3.19123.1">
|
||||
<Dependency Name="dotnet-ef" Version="3.0.0-preview4.19121.2">
|
||||
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
|
||||
<Sha>ec6044a9d3b6a8b28c76cda4b97ec9182081bd58</Sha>
|
||||
<Sha>b7c17b1eca39ccbdd82ba403f2ae04ef6b4f02ec</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19066.2">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19115.3">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>ac8f12b90238542dfd2ea596178ae24ea20a0f55</Sha>
|
||||
<Sha>42a212514e375a0821baab69fbac462e39590cfb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview3.19123.1">
|
||||
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview4.19118.4">
|
||||
<Uri>https://github.com/dotnet/toolset</Uri>
|
||||
<Sha>0d8427d1a876c5585f9733b9618ee5fc32f2c926</Sha>
|
||||
<Sha>de6587837888584f67b0d4fe389c40e704c19e9f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19078.1">
|
||||
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19123.1">
|
||||
<Uri>https://github.com/dotnet/standard</Uri>
|
||||
<Sha>e2dfe6f4656806953ab18edccc9c2c9c116ce15c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview4.19111.1">
|
||||
<Uri>https://github.com/dotnet/cli</Uri>
|
||||
<Sha></Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19112.3">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19122.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9a5da1c8a3232c6304955c7a6ffe6109a1b13d9f</Sha>
|
||||
<Sha>78ccbeb1c8de779a6650257b408f5b3b4de16a0f</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/EntityFrameworkCore -->
|
||||
<dotnetefPackageVersion>3.0.0-preview3.19123.1</dotnetefPackageVersion>
|
||||
<dotnetefPackageVersion>3.0.0-preview4.19121.2</dotnetefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
|
|
@ -27,31 +27,34 @@
|
|||
<DotnetUserSecretsPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</DotnetUserSecretsPackageVersion>
|
||||
<DotnetWatchPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</DotnetWatchPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/cli -->
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview4.19111.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview3-27422-6</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19078.1</NETStandardLibraryPackageVersion>
|
||||
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19123.1</NETStandardLibraryPackageVersion>
|
||||
<!-- Use a different property name here, as NETStandardLibraryPackageVersion is also set by targets in the NETStandard.Library package,
|
||||
which ends up overriding the value set here. -->
|
||||
<NETSTandardTargetingPackVersion>$(NETStandardLibraryPackageVersion)</NETSTandardTargetingPackVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19066.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19115.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19106.1</MicrosoftDotNetTestProjectTemplates30PackageVersion>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
<NUnit3TemplatesVersion>1.6.1</NUnit3TemplatesVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</CLI_NETStandardLibraryNETFrameworkVersion>
|
||||
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
|
||||
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
|
||||
<NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
|
||||
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreVersion>
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview4-27422-21</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetTargetingPackVersion>
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview3-27420-40</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
|
||||
<MicrosoftDotnetWpfProjectTemplatesPackageVersion>$(MicrosoftWindowsDesktopPackageVersion)</MicrosoftDotnetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>$(MicrosoftWindowsDesktopPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
|
|
|
|||
|
|
@ -99,7 +99,6 @@ function Build {
|
|||
/p:PerformanceTest=$performanceTest `
|
||||
/p:Sign=$sign `
|
||||
/p:Publish=$publish `
|
||||
/p:ContinuousIntegrationBuild=$ci `
|
||||
@properties
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ set -e
|
|||
usage()
|
||||
{
|
||||
echo "Common settings:"
|
||||
echo " --configuration <value> Build configuration: 'Debug' or 'Release' (short: --c)"
|
||||
echo " --configuration <value> Build configuration: 'Debug' or 'Release' (short: -c)"
|
||||
echo " --verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)"
|
||||
echo " --binaryLog Create MSBuild binary log (short: -bl)"
|
||||
echo ""
|
||||
|
|
@ -191,7 +191,6 @@ function Build {
|
|||
/p:PerformanceTest=$performance_test \
|
||||
/p:Sign=$sign \
|
||||
/p:Publish=$publish \
|
||||
/p:ContinuousIntegrationBuild=$ci \
|
||||
$properties
|
||||
|
||||
ExitWithExitCode 0
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ function InstallDarcCli ($darcVersion) {
|
|||
# Until we can anonymously query the BAR API for the latest arcade-services
|
||||
# build applied to the PROD channel, this is hardcoded.
|
||||
if (-not $darcVersion) {
|
||||
$darcVersion = '1.1.0-beta.19081.1'
|
||||
$darcVersion = '1.1.0-beta.19120.2'
|
||||
}
|
||||
|
||||
$arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,24 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
source="${BASH_SOURCE[0]}"
|
||||
darcVersion="1.1.0-beta.19120.2"
|
||||
|
||||
while [[ $# > 0 ]]; do
|
||||
opt="$(echo "$1" | awk '{print tolower($0)}')"
|
||||
case "$opt" in
|
||||
--darcversion)
|
||||
darcVersion=$2
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
echo "Invalid argument: $1"
|
||||
usage
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
shift
|
||||
done
|
||||
|
||||
# resolve $source until the file is no longer a symlink
|
||||
while [[ -h "$source" ]]; do
|
||||
|
|
@ -27,12 +45,11 @@ function InstallDarcCli {
|
|||
echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g)
|
||||
fi
|
||||
|
||||
ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk"
|
||||
local toolset_version=$_ReadGlobalVersion
|
||||
local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json"
|
||||
|
||||
echo "Installing Darc CLI version $toolset_version..."
|
||||
echo "You may need to restart your command shell if this is the first dotnet tool you have installed."
|
||||
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $toolset_version -v $verbosity -g)
|
||||
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g)
|
||||
}
|
||||
|
||||
InstallDarcCli
|
||||
|
|
|
|||
|
|
@ -108,6 +108,10 @@ jobs:
|
|||
- name: ${{ pair.key }}
|
||||
value: ${{ pair.value }}
|
||||
|
||||
# DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds
|
||||
- ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
- group: DotNet-HelixApi-Access
|
||||
|
||||
${{ if ne(parameters.workspace, '') }}:
|
||||
workspace: ${{ parameters.workspace }}
|
||||
|
||||
|
|
|
|||
|
|
@ -417,15 +417,15 @@ function InitializeToolset() {
|
|||
|
||||
$proj = Join-Path $ToolsetDir "restore.proj"
|
||||
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" }
|
||||
|
||||
|
||||
'<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' | Set-Content $proj
|
||||
MSBuild $proj $bl /t:__WriteToolsetLocation /noconsolelogger /p:__ToolsetLocationOutputFile=$toolsetLocationFile
|
||||
|
||||
MSBuild $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile
|
||||
|
||||
$path = Get-Content $toolsetLocationFile -TotalCount 1
|
||||
if (!(Test-Path $path)) {
|
||||
throw "Invalid toolset path: $path"
|
||||
}
|
||||
|
||||
|
||||
return $global:_ToolsetBuildProj = $path
|
||||
}
|
||||
|
||||
|
|
@ -461,7 +461,7 @@ function MSBuild() {
|
|||
|
||||
$buildTool = InitializeBuildTool
|
||||
|
||||
$cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse"
|
||||
$cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
|
||||
|
||||
if ($warnAsError) {
|
||||
$cmdArgs += " /warnaserror /p:TreatWarningsAsErrors=true"
|
||||
|
|
|
|||
|
|
@ -238,11 +238,15 @@ function InitializeToolset {
|
|||
ExitWithExitCode 2
|
||||
fi
|
||||
|
||||
local toolset_restore_log="$log_dir/ToolsetRestore.binlog"
|
||||
local proj="$toolset_dir/restore.proj"
|
||||
|
||||
local bl=""
|
||||
if [[ "$binary_log" == true ]]; then
|
||||
bl="/bl:$log_dir/ToolsetRestore.binlog"
|
||||
fi
|
||||
|
||||
echo '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' > "$proj"
|
||||
MSBuild "$proj" /t:__WriteToolsetLocation /noconsolelogger /bl:"$toolset_restore_log" /p:__ToolsetLocationOutputFile="$toolset_location_file"
|
||||
MSBuild "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file"
|
||||
|
||||
local toolset_build_proj=`cat "$toolset_location_file"`
|
||||
|
||||
|
|
@ -289,7 +293,7 @@ function MSBuild {
|
|||
warnaserror_switch="/warnaserror"
|
||||
fi
|
||||
|
||||
"$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error "$@" || {
|
||||
"$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" || {
|
||||
local exit_code=$?
|
||||
echo "Build failed (exit code '$exit_code')." >&2
|
||||
ExitWithExitCode $exit_code
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
"dotnet": "3.0.100-preview-009812"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19112.3"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19122.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Channel>release/3.0.1xx</Channel>
|
||||
<Channel>master</Channel>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Target Name="FinalizeBuild"
|
||||
DependsOnTargets="SetSdkVersionInfo"
|
||||
AfterTargets="Build">
|
||||
BeforeTargets="AfterBuild">
|
||||
<CopyBlobsToLatest FeedUrl="$(DotnetPublishSdkAssetsBlobFeedUrl)"
|
||||
AccountKey="$(DotNetPublishSdkAssetsBlobFeedKey)"
|
||||
NugetVersion="$(FullNugetVersion)"
|
||||
|
|
|
|||
38
src/SdkResolver/SdkResolver.csproj
Normal file
38
src/SdkResolver/SdkResolver.csproj
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
|
||||
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
|
||||
<GenerateDependencyFile>false</GenerateDependencyFile>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
<GenerateRuntimeCofigurationFiles>false</GenerateRuntimeCofigurationFiles>
|
||||
<AssemblyName>UNUSED</AssemblyName>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.DotNet.MSBuildSdkResolver" Version="$(MicrosoftDotNetMSBuildSdkResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true"/>
|
||||
<PackageReference Include="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
|
||||
<PackageReference Include="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target
|
||||
Name="GenerateLayout"
|
||||
Condition=" '$(OS)' == 'Windows_NT' "
|
||||
BeforeTargets="AfterBuild"
|
||||
>
|
||||
<Message Importance="High" Text="$(MSBuildProjectName) -> $(OutputPath)" />
|
||||
|
||||
<RemoveDir Directories="$(OutputPath)" />
|
||||
<MakeDir Directories="$(OutputPath)" />
|
||||
|
||||
<ItemGroup>
|
||||
<_SdkResolverSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" />
|
||||
<_SdkResolverSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" />
|
||||
<_SdkResolverSrc Include="$(PkgMicrosoft_DotNet_MSBuildSdkResolver)\lib\net472\**\*.dll" Arch="" />
|
||||
<_SdkResolverDst Include="@(_SdkResolverSrc->'$(OutputPath)%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
</ItemGroup>
|
||||
|
||||
<Copy SourceFiles="@(_SdkResolverSrc)" DestinationFiles="@(_SdkResolverDst)" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -11,6 +11,8 @@
|
|||
of the version from the stage 0 SDK. -->
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)"
|
||||
PrivateAssets="All" Publish="true"/>
|
||||
|
||||
<ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
<Target Name="GenerateVersionBadge"
|
||||
DependsOnTargets="SetBadgeProps"
|
||||
AfterTargets="Build">
|
||||
BeforeTargets="AfterBuild">
|
||||
<Message Text="$(VersionBadge)" />
|
||||
|
||||
<ReplaceFileContents
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Restore">
|
||||
|
||||
<Project DefaultTargets="Restore">
|
||||
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
|
||||
<PropertyGroup>
|
||||
<OutputType>Library</OutputType>
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
|
|
@ -10,4 +10,8 @@
|
|||
<PackageReference Include="$(PackageToRestore)" Version="$(PackageVersionToRestore)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
|
||||
|
||||
<!-- Workaround newer sdk preventing us from downloading Microsoft.AspNetCore.App via PackageReference above. -->
|
||||
<Target Name="UpdateAspNetToFrameworkReference" />
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project>
|
||||
<Target Name="GenerateArchives"
|
||||
DependsOnTargets="GenerateLayout;GetCurrentRuntimeInformation"
|
||||
AfterTargets="Build">
|
||||
BeforeTargets="AfterBuild">
|
||||
|
||||
<!-- When running in Docker under a Windows host, tar is warning "file changed as we read it" for several files and returning exit code 1.
|
||||
So this flag allows that to be ignored. -->
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
<_BuildUnlessNoBuild Condition="'$(NoBuild)' != 'true'">Build</_BuildUnlessNoBuild>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="GenerateInstallers"
|
||||
AfterTargets="Pack"
|
||||
DependsOnTargets="GetCurrentRuntimeInformation;
|
||||
DependsOnTargets="$(_BuildUnlessNoBuild);
|
||||
GetCurrentRuntimeInformation;
|
||||
GenerateMsis;
|
||||
GeneratePkgs;
|
||||
GenerateRpms;
|
||||
|
|
|
|||
|
|
@ -358,13 +358,13 @@
|
|||
CrossgenLayout;
|
||||
LayoutAppHostTemplate;
|
||||
SignLayout"
|
||||
AfterTargets="Build">
|
||||
BeforeTargets="AfterBuild">
|
||||
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateInternalLayout"
|
||||
DependsOnTargets="GenerateLayout"
|
||||
AfterTargets="Build">
|
||||
BeforeTargets="AfterBuild">
|
||||
|
||||
<RemoveDir Directories="$(SdkInternalLayoutPath)" />
|
||||
<MakeDir Directories="$(SdkInternalLayoutPath)" />
|
||||
|
|
|
|||
|
|
@ -24,6 +24,10 @@
|
|||
<VSToolsNuspecFile>$(MSBuildThisFileDirectory)/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.$(Architecture).nuspec</VSToolsNuspecFile>
|
||||
<VSToolsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</VSToolsNupkgFile>
|
||||
|
||||
<SdkResolverLayoutPath>$(ArtifactsDir)bin/SdkResolver/$(Configuration)</SdkResolverLayoutPath>
|
||||
<VSToolsResolverNuspecFile>$(MSBuildThisFileDirectory)/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec</VSToolsResolverNuspecFile>
|
||||
<VSToolsResolverNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.Resolver.nupkg</VSToolsResolverNupkgFile>
|
||||
|
||||
<!--<SdkMSBuildExtensionsNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec</SdkMSBuildExtensionsNuspecFile>
|
||||
<SdkMSBuildExtensionsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>
|
||||
<SdkMSBuildExtensionsSwrFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr</SdkMSBuildExtensionsSwrFile>-->
|
||||
|
|
@ -181,6 +185,21 @@
|
|||
'$(VSToolsNupkgFile)'" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateVSToolsResolverNupkg"
|
||||
DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkBundle"
|
||||
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x86'"
|
||||
Inputs="$(SdkResolverLayoutPath)/**/*;
|
||||
$(VSToolsResolverNuspecFile);
|
||||
$(SdkGenerateNupkgPowershellScript)"
|
||||
Outputs="$(VSToolsResolverNupkgFile)">
|
||||
|
||||
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript) ^
|
||||
'$(SdkResolverLayoutPath.TrimEnd('\'))' ^
|
||||
'$(FullNugetVersion)' ^
|
||||
'$(VSToolsResolverNuspecFile)' ^
|
||||
'$(VSToolsResolverNupkgFile)'" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateSdkMSBuildExtensionsNupkg"
|
||||
DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkBundle"
|
||||
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "
|
||||
|
|
@ -213,6 +232,7 @@
|
|||
SignSdkBundle;
|
||||
GenerateSdkNupkg;
|
||||
GenerateVSToolsNupkg;
|
||||
GenerateVSToolsResolverNupkg;
|
||||
GenerateSdkMSBuildExtensionsNupkg"
|
||||
Condition=" '$(OS)' == 'Windows_NT' and !$(Architecture.StartsWith('arm'))" />
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<Project>
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.dotnet.signtool\$(MicrosoftDotNetSignToolVersion)\build\Microsoft.DotNet.SignTool.props" />
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.DotNet.SignTool" Version="$(MicrosoftDotNetSignToolVersion)" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="SetSignProps"
|
||||
Condition="'$(SignCoreSdk)' == 'true'">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<VersionMinor>0</VersionMinor>
|
||||
<VersionSDKMinor>1</VersionSDKMinor>
|
||||
<VersionPatch>00</VersionPatch>
|
||||
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview3</ReleaseSuffix>
|
||||
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview4</ReleaseSuffix>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="GetCoreSdkGitCommitInfo">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
@echo off
|
||||
|
||||
set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
||||
set DOTNET_MULTILELVEL_LOOKUP=0
|
||||
set PATH=%~dp0;%PATH%
|
||||
set DOTNET_MULTILEVEL_LOOKUP=0
|
||||
set PATH=%~dp0;%PATH%
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0"?>
|
||||
<package>
|
||||
<aggregate id="MsBuild.Corext" version="15.0"/>
|
||||
</package>
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||
<metadata>
|
||||
<id>VS.Tools.Net.Core.SDK.Resolver</id>
|
||||
<version>1.0.0</version>
|
||||
<title>VS.Tools.Net.Core.SDK.Resolver</title>
|
||||
<authors>Microsoft</authors>
|
||||
<owners>Microsoft</owners>
|
||||
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
|
||||
<projectUrl>https://github.com/dotnet/cli</projectUrl>
|
||||
<requireLicenseAcceptance>true</requireLicenseAcceptance>
|
||||
<description>.Net Core SDK MSBuild resolver for internal VS build consumption</description>
|
||||
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="$DOTNET_BUNDLE$\**\*" target="v15.0\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver" />
|
||||
<file src="VS.Tools.Net.Core.SDK.Resolver.cxspec" />
|
||||
</files>
|
||||
</package>
|
||||
|
|
@ -42,25 +42,25 @@
|
|||
|
||||
<swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
|
||||
|
||||
<util:RegistrySearch Id="CheckSDKInstallLocation_x86"
|
||||
Variable="SDKInstallLocationExists_x86"
|
||||
<util:RegistrySearch Id="CheckDotnetInstallLocation_x86"
|
||||
Variable="DotnetInstallLocationExists_x86"
|
||||
Result="exists"
|
||||
Root="HKLM"
|
||||
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86\sdk"
|
||||
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86"
|
||||
Value="InstallLocation" />
|
||||
<util:RegistrySearch Id="SDKInstallLocation_x86"
|
||||
After="CheckSDKInstallLocation_x86"
|
||||
Condition="SDKInstallLocationExists_x86"
|
||||
<util:RegistrySearch Id="DotnetInstallLocation_x86"
|
||||
After="CheckDotnetInstallLocation_x86"
|
||||
Condition="DotnetInstallLocationExists_x86"
|
||||
Variable="DOTNETHOME_X86"
|
||||
Result="value"
|
||||
Root="HKLM"
|
||||
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86\sdk"
|
||||
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86"
|
||||
Value="InstallLocation" />
|
||||
|
||||
<util:FileSearch Id="DotnetExeSearch_x86"
|
||||
After="SDKInstallLocation_x86"
|
||||
After="DotnetInstallLocation_x86"
|
||||
Variable="DotnetExeExists_x86"
|
||||
Condition="NOT SDKInstallLocationExists_x86"
|
||||
Condition="NOT DotnetInstallLocationExists_x86"
|
||||
Result="exists"
|
||||
Path="[ProgramFilesFolder]dotnet\dotnet.exe"/>
|
||||
<util:DirectorySearch Id="DotnetExeLocation_x86"
|
||||
|
|
@ -69,25 +69,25 @@
|
|||
Variable="DOTNETHOME_X86"
|
||||
Path="[ProgramFilesFolder]dotnet"/>
|
||||
|
||||
<util:RegistrySearch Id="CheckSDKInstallLocation_x64"
|
||||
Variable="SDKInstallLocationExists_x64"
|
||||
<util:RegistrySearch Id="CheckDotnetInstallLocation_x64"
|
||||
Variable="DotnetInstallLocationExists_x64"
|
||||
Result="exists"
|
||||
Root="HKLM"
|
||||
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64\sdk"
|
||||
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64"
|
||||
Value="InstallLocation" />
|
||||
<util:RegistrySearch Id="SDKInstallLocation_x64"
|
||||
After="CheckSDKInstallLocation_x64"
|
||||
Condition="SDKInstallLocationExists_x64"
|
||||
<util:RegistrySearch Id="DotnetInstallLocation_x64"
|
||||
After="CheckDotnetInstallLocation_x64"
|
||||
Condition="DotnetInstallLocationExists_x64"
|
||||
Variable="DOTNETHOME_X64"
|
||||
Result="value"
|
||||
Root="HKLM"
|
||||
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64\sdk"
|
||||
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64"
|
||||
Value="InstallLocation" />
|
||||
|
||||
<util:FileSearch Id="DotnetExeSearch_x64"
|
||||
After="SDKInstallLocation_x64"
|
||||
After="DotnetInstallLocation_x64"
|
||||
Variable="DotnetExeExists_x64"
|
||||
Condition="NOT SDKInstallLocationExists_x64"
|
||||
Condition="NOT DotnetInstallLocationExists_x64"
|
||||
Result="exists"
|
||||
Path="[ProgramFiles64Folder]dotnet\dotnet.exe"/>
|
||||
<util:DirectorySearch Id="DotnetExeLocation_x64"
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@
|
|||
<RegistryValue Action="write" Name="WpfWinformsTemplates" Type="integer" Value="1" KeyPath="yes"/>
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
<Component Id="SDKInstallLocation_x64" Directory="TARGETDIR" Win64="no">
|
||||
<Component Id="DotnetInstallLocation_x64" Directory="TARGETDIR" Win64="no">
|
||||
<Condition>VersionNT64 AND DOTNETHOME_X64</Condition>
|
||||
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64\sdk">
|
||||
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64">
|
||||
<RegistryValue Action="write" Name="InstallLocation" Type="string" Value="[DOTNETHOME_X64]" KeyPath="yes"/>
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
<Component Id="SDKInstallLocation_x86" Directory="TARGETDIR" Win64="no">
|
||||
<Component Id="DotnetInstallLocation_x86" Directory="TARGETDIR" Win64="no">
|
||||
<Condition>DOTNETHOME_X86</Condition>
|
||||
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86\sdk">
|
||||
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86">
|
||||
<RegistryValue Action="write" Name="InstallLocation" Type="string" Value="[DOTNETHOME_X86]" KeyPath="yes"/>
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue