Merge remote-tracking branch 'cli/release/2.2.1xx' into merge-cli/release/2.2.1xx-to-core-sdk/master
This commit is contained in:
Nick Guerrera
commit
29d3640768
36 changed files with 703 additions and 75 deletions
43
Documentation/manpages/sdk/dotnet-build-server.1
Normal file
43
Documentation/manpages/sdk/dotnet-build-server.1
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
.\" Automatically generated by Pandoc 2.2.1
|
||||
.\"
|
||||
.TH "dotnet build\-server command \- .NET Core CLI" "1" "" "" ".NET Core"
|
||||
.hy
|
||||
.SH dotnet\-build
|
||||
.PP
|
||||
.SH NAME
|
||||
.PP
|
||||
\f[C]dotnet\ build\-server\f[] \- Interacts with servers started by a build.
|
||||
.SH SYNOPSIS
|
||||
.IP
|
||||
.nf
|
||||
\f[C]
|
||||
dotnet\ build\-server\ shutdown\ [\-\-msbuild]\ [\-\-razor]\ [\-\-vbcscompiler]
|
||||
dotnet\ build\-server\ shutdown\ [\-h|\-\-help]
|
||||
dotnet\ build\-server\ [\-h|\-\-help]
|
||||
\f[]
|
||||
.fi
|
||||
.SS Commands
|
||||
.PP
|
||||
\f[C]shutdown\f[]
|
||||
.PP
|
||||
Shuts down build servers that are started from dotnet.
|
||||
By default, all servers are shut down.
|
||||
.SH OPTIONS
|
||||
.PP
|
||||
\f[C]\-h|\-\-help\f[]
|
||||
.PP
|
||||
Prints out a short help for the command.
|
||||
.PP
|
||||
\f[C]\-\-msbuild\f[]
|
||||
.PP
|
||||
Shuts down the MSBuild build server.
|
||||
.PP
|
||||
\f[C]\-\-razor\f[]
|
||||
.PP
|
||||
Shuts down the Razor build server.
|
||||
.PP
|
||||
\f[C]\-\-vbcscompiler\f[]
|
||||
.PP
|
||||
Shuts down the VB/C# compiler build server.
|
||||
.SH AUTHORS
|
||||
mairaw.
|
||||
116
Documentation/manpages/sdk/dotnet-tool-install.1
Normal file
116
Documentation/manpages/sdk/dotnet-tool-install.1
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
.\"t
|
||||
.\" Automatically generated by Pandoc 2.2.1
|
||||
.\"
|
||||
.TH "dotnet tool install command \- .NET Core CLI" "1" "" "" ".NET Core"
|
||||
.hy
|
||||
.SH dotnet tool install
|
||||
.PP
|
||||
.SH NAME
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ install\f[] \- Installs the specified .NET Core Global Tool on your machine.
|
||||
.SH SYNOPSIS
|
||||
.IP
|
||||
.nf
|
||||
\f[C]
|
||||
dotnet\ tool\ install\ <PACKAGE_NAME>\ <\-g|\-\-global>\ [\-\-add\-source]\ [\-\-configfile]\ [\-\-framework]\ [\-v|\-\-verbosity]\ [\-\-version]
|
||||
dotnet\ tool\ install\ <PACKAGE_NAME>\ <\-\-tool\-path>\ [\-\-add\-source]\ [\-\-configfile]\ [\-\-framework]\ [\-v|\-\-verbosity]\ [\-\-version]
|
||||
dotnet\ tool\ install\ <\-h|\-\-help>
|
||||
\f[]
|
||||
.fi
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
The \f[C]dotnet\ tool\ install\f[] command provides a way for you to install .NET Core Global Tools on your machine.
|
||||
To use the command, you either have to specify that you want a user\-wide installation using the \f[C]\-\-global\f[] option or you specify a path to install it using the \f[C]\-\-tool\-path\f[] option.
|
||||
.PP
|
||||
Global Tools are installed in the following directories by default when you specify the \f[C]\-g\f[] (or \f[C]\-\-global\f[]) option:
|
||||
.PP
|
||||
.TS
|
||||
tab(@);
|
||||
l l.
|
||||
T{
|
||||
OS
|
||||
T}@T{
|
||||
Path
|
||||
T}
|
||||
_
|
||||
T{
|
||||
Linux/macOS
|
||||
T}@T{
|
||||
\f[C]$HOME/.dotnet/tools\f[]
|
||||
T}
|
||||
T{
|
||||
Windows
|
||||
T}@T{
|
||||
\f[C]%USERPROFILE%\\.dotnet\\tools\f[]
|
||||
T}
|
||||
.TE
|
||||
.SS Arguments
|
||||
.PP
|
||||
\f[C]PACKAGE_NAME\f[]
|
||||
.PP
|
||||
Name/ID of the NuGet package that contains the .NET Core Global Tool to install.
|
||||
.SH OPTIONS
|
||||
.PP
|
||||
\f[C]\-\-add\-source\ <SOURCE>\f[]
|
||||
.PP
|
||||
Adds an additional NuGet package source to use during installation.
|
||||
.PP
|
||||
\f[C]\-\-configfile\ <FILE>\f[]
|
||||
.PP
|
||||
The NuGet configuration (\f[I]nuget.config\f[]) file to use.
|
||||
.PP
|
||||
\f[C]\-\-framework\ <FRAMEWORK>\f[]
|
||||
.PP
|
||||
Specifies the target framework to install the tool for.
|
||||
By default, the .NET Core SDK tries to choose the most appropriate target framework.
|
||||
.PP
|
||||
\f[C]\-g|\-\-global\f[]
|
||||
.PP
|
||||
Specifies that the installation is user wide.
|
||||
Can't be combined with the \f[C]\-\-tool\-path\f[] option.
|
||||
If you don't specify this option, you must specify the \f[C]\-\-tool\-path\f[] option.
|
||||
.PP
|
||||
\f[C]\-h|\-\-help\f[]
|
||||
.PP
|
||||
Prints out a short help for the command.
|
||||
.PP
|
||||
\f[C]\-\-tool\-path\ <PATH>\f[]
|
||||
.PP
|
||||
Specifies the location where to install the Global Tool.
|
||||
PATH can be absolute or relative.
|
||||
If PATH doesn't exist, the command tries to create it.
|
||||
Can't be combined with the \f[C]\-\-global\f[] option.
|
||||
If you don't specify this option, you must specify the \f[C]\-\-global\f[] option.
|
||||
.PP
|
||||
\f[C]\-v|\-\-verbosity\ <LEVEL>\f[]
|
||||
.PP
|
||||
Sets the verbosity level of the command.
|
||||
Allowed values are \f[C]q[uiet]\f[], \f[C]m[inimal]\f[], \f[C]n[ormal]\f[], \f[C]d[etailed]\f[], and \f[C]diag[nostic]\f[].
|
||||
.PP
|
||||
\f[C]\-\-version\ <VERSION_NUMBER>\f[]
|
||||
.PP
|
||||
The version of the tool to install.
|
||||
By default, the latest stable package version is installed.
|
||||
Use this option to install preview or older versions of the tool.
|
||||
.SH EXAMPLES
|
||||
.PP
|
||||
Installs the dotnetsay Global Tool in the default location:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ install\ \-g\ dotnetsay\f[]
|
||||
.PP
|
||||
Installs the dotnetsay Global Tool on a specific Windows folder:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ install\ dotnetsay\ \-\-tool\-path\ c:\\global\-tools\f[]
|
||||
.PP
|
||||
Installs the dotnetsay Global Tool on a specific Linux/macOS folder:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ install\ dotnetsay\ \-\-tool\-path\ ~/bin\f[]
|
||||
.PP
|
||||
Installs version 2.0.0 of the dotnetsay Global Tool:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ install\ \-g\ dotnetsay\ \-\-version\ 2.0.0\f[]
|
||||
.SS See also
|
||||
.PP
|
||||
\&.NET Core Global Tools
|
||||
.SH AUTHORS
|
||||
mairaw.
|
||||
59
Documentation/manpages/sdk/dotnet-tool-list.1
Normal file
59
Documentation/manpages/sdk/dotnet-tool-list.1
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
.\" Automatically generated by Pandoc 2.2.1
|
||||
.\"
|
||||
.TH "dotnet tool list command \- .NET Core CLI" "1" "" "" ".NET Core"
|
||||
.hy
|
||||
.SH dotnet tool list
|
||||
.PP
|
||||
.SH NAME
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ list\f[] \- Lists all .NET Core Global Tools currently installed in the default directory on your machine or in the specified path.
|
||||
.SH SYNOPSIS
|
||||
.IP
|
||||
.nf
|
||||
\f[C]
|
||||
dotnet\ tool\ list\ <\-g|\-\-global>
|
||||
dotnet\ tool\ list\ <\-\-tool\-path>
|
||||
dotnet\ tool\ list\ <\-h|\-\-help>
|
||||
\f[]
|
||||
.fi
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
The \f[C]dotnet\ tool\ list\f[] command provides a way for you to list all .NET Core Global Tools installed user\-wide on your machine (current user profile) or in the specified path.
|
||||
The command lists the package name, version installed, and the Global Tool command.
|
||||
To use the list command, you either have to specify that you want to see all user\-wide tools using the \f[C]\-\-global\f[] option or specify a custom path using the \f[C]\-\-tool\-path\f[] option.
|
||||
.SH OPTIONS
|
||||
.PP
|
||||
\f[C]\-g|\-\-global\f[]
|
||||
.PP
|
||||
Lists user\-wide Global Tools.
|
||||
Can't be combined with the \f[C]\-\-tool\-path\f[] option.
|
||||
If you don't specify this option, you must specify the \f[C]\-\-tool\-path\f[] option.
|
||||
.PP
|
||||
\f[C]\-h|\-\-help\f[]
|
||||
.PP
|
||||
Prints out a short help for the command.
|
||||
.PP
|
||||
\f[C]\-\-tool\-path\ <PATH>\f[]
|
||||
.PP
|
||||
Specifies a custom location where to find Global Tools.
|
||||
PATH can be absolute or relative.
|
||||
Can't be combined with the \f[C]\-\-global\f[] option.
|
||||
If you don't specify this option, you must specify the \f[C]\-\-global\f[] option.
|
||||
.SH EXAMPLES
|
||||
.PP
|
||||
Lists all Global Tools installed user\-wide on your machine (current user profile):
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ list\ \-g\f[]
|
||||
.PP
|
||||
Lists the Global Tools from a specific Windows folder:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ list\ \-\-tool\-path\ c:\\global\-tools\f[]
|
||||
.PP
|
||||
Lists the Global Tools from a specific Linux/macOS folder:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ list\ \-\-tool\-path\ ~/bin\f[]
|
||||
.SS See also
|
||||
.PP
|
||||
\&.NET Core Global Tools
|
||||
.SH AUTHORS
|
||||
mairaw.
|
||||
64
Documentation/manpages/sdk/dotnet-tool-uninstall.1
Normal file
64
Documentation/manpages/sdk/dotnet-tool-uninstall.1
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
.\" Automatically generated by Pandoc 2.2.1
|
||||
.\"
|
||||
.TH "dotnet tool uninstall command \- .NET Core CLI" "1" "" "" ".NET Core"
|
||||
.hy
|
||||
.SH dotnet tool uninstall
|
||||
.PP
|
||||
.SH NAME
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ uninstall\f[] \- Uninstalls the specified .NET Core Global Tool from your machine.
|
||||
.SH SYNOPSIS
|
||||
.IP
|
||||
.nf
|
||||
\f[C]
|
||||
dotnet\ tool\ uninstall\ <PACKAGE_NAME>\ <\-g|\-\-global>
|
||||
dotnet\ tool\ uninstall\ <PACKAGE_NAME>\ <\-\-tool\-path>
|
||||
dotnet\ tool\ uninstall\ <\-h|\-\-help>
|
||||
\f[]
|
||||
.fi
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
The \f[C]dotnet\ tool\ uninstall\f[] command provides a way for you to uninstall .NET Core Global Tools from your machine.
|
||||
To use the command, you either have to specify that you want to remove a user\-wide tool using the \f[C]\-\-global\f[] option or specify a path to where the tool is installed using the \f[C]\-\-tool\-path\f[] option.
|
||||
.SS Arguments
|
||||
.PP
|
||||
\f[C]PACKAGE_NAME\f[]
|
||||
.PP
|
||||
Name/ID of the NuGet package that contains the .NET Core Global Tool to uninstall.
|
||||
You can find the package name using the dotnet tool list command.
|
||||
.SH OPTIONS
|
||||
.PP
|
||||
\f[C]\-g|\-\-global\f[]
|
||||
.PP
|
||||
Specifies that the tool to be removed is from a user\-wide installation.
|
||||
Can't be combined with the \f[C]\-\-tool\-path\f[] option.
|
||||
If you don't specify this option, you must specify the \f[C]\-\-tool\-path\f[] option.
|
||||
.PP
|
||||
\f[C]\-h|\-\-help\f[]
|
||||
.PP
|
||||
Prints out a short help for the command.
|
||||
.PP
|
||||
\f[C]\-\-tool\-path\ <PATH>\f[]
|
||||
.PP
|
||||
Specifies the location where to uninstall the Global Tool.
|
||||
PATH can be absolute or relative.
|
||||
Can't be combined with the \f[C]\-\-global\f[] option.
|
||||
If you don't specify this option, you must specify the \f[C]\-\-global\f[] option.
|
||||
.SH EXAMPLES
|
||||
.PP
|
||||
Uninstalls the dotnetsay Global Tool:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ uninstall\ \-g\ dotnetsay\f[]
|
||||
.PP
|
||||
Uninstalls the dotnetsay Global Tool from a specific Windows folder:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ uninstall\ dotnetsay\ \-\-tool\-path\ c:\\global\-tools\f[]
|
||||
.PP
|
||||
Uninstalls the dotnetsay Global Tool from a specific Linux/macOS folder:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ uninstall\ dotnetsay\ \-\-tool\-path\ ~/bin\f[]
|
||||
.SS See also
|
||||
.PP
|
||||
\&.NET Core Global Tools
|
||||
.SH AUTHORS
|
||||
mairaw.
|
||||
82
Documentation/manpages/sdk/dotnet-tool-update.1
Normal file
82
Documentation/manpages/sdk/dotnet-tool-update.1
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
.\" Automatically generated by Pandoc 2.2.1
|
||||
.\"
|
||||
.TH "dotnet tool update command \- .NET Core CLI" "1" "" "" ".NET Core"
|
||||
.hy
|
||||
.SH dotnet tool update
|
||||
.PP
|
||||
.SH NAME
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ update\f[] \- Updates the specified .NET Core Global Tool on your machine.
|
||||
.SH SYNOPSIS
|
||||
.IP
|
||||
.nf
|
||||
\f[C]
|
||||
dotnet\ tool\ update\ <PACKAGE_NAME>\ <\-g|\-\-global>\ [\-\-configfile]\ [\-\-framework]\ [\-v|\-\-verbosity]
|
||||
dotnet\ tool\ update\ <PACKAGE_NAME>\ <\-\-tool\-path>\ [\-\-configfile]\ [\-\-framework]\ [\-v|\-\-verbosity]
|
||||
dotnet\ tool\ update\ <\-h|\-\-help>
|
||||
\f[]
|
||||
.fi
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
The \f[C]dotnet\ tool\ update\f[] command provides a way for you to update .NET Core Global Tools on your machine to the latest stable version of the package.
|
||||
The command uninstalls and reinstalls a tool, effectively updating it.
|
||||
To use the command, you either have to specify that you want to update a tool from a user\-wide installation using the \f[C]\-\-global\f[] option or specify a path to where the tool is installed using the \f[C]\-\-tool\-path\f[] option.
|
||||
.SS Arguments
|
||||
.PP
|
||||
\f[C]PACKAGE_NAME\f[]
|
||||
.PP
|
||||
Name/ID of the NuGet package that contains the .NET Core Global Tool to update.
|
||||
You can find the package name using the dotnet tool list command.
|
||||
.SH OPTIONS
|
||||
.PP
|
||||
\f[C]\-\-add\-source\ <SOURCE>\f[]
|
||||
.PP
|
||||
Adds an additional NuGet package source to use during installation.
|
||||
.PP
|
||||
\f[C]\-\-configfile\ <FILE>\f[]
|
||||
.PP
|
||||
The NuGet configuration (\f[I]nuget.config\f[]) file to use.
|
||||
.PP
|
||||
\f[C]\-\-framework\ <FRAMEWORK>\f[]
|
||||
.PP
|
||||
Specifies the target framework to update the tool for.
|
||||
.PP
|
||||
\f[C]\-g|\-\-global\f[]
|
||||
.PP
|
||||
Specifies that the update is for a user\-wide tool.
|
||||
Can't be combined with the \f[C]\-\-tool\-path\f[] option.
|
||||
If you don't specify this option, you must specify the \f[C]\-\-tool\-path\f[] option.
|
||||
.PP
|
||||
\f[C]\-h|\-\-help\f[]
|
||||
.PP
|
||||
Prints out a short help for the command.
|
||||
.PP
|
||||
\f[C]\-\-tool\-path\ <PATH>\f[]
|
||||
.PP
|
||||
Specifies the location where the Global Tool is installed.
|
||||
PATH can be absolute or relative.
|
||||
Can't be combined with the \f[C]\-\-global\f[] option.
|
||||
If you don't specify this option, you must specify the \f[C]\-\-global\f[] option.
|
||||
.PP
|
||||
\f[C]\-v|\-\-verbosity\ <LEVEL>\f[]
|
||||
.PP
|
||||
Sets the verbosity level of the command.
|
||||
Allowed values are \f[C]q[uiet]\f[], \f[C]m[inimal]\f[], \f[C]n[ormal]\f[], \f[C]d[etailed]\f[], and \f[C]diag[nostic]\f[].
|
||||
.SH EXAMPLES
|
||||
.PP
|
||||
Updates the dotnetsay Global Tool:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ update\ \-g\ dotnetsay\f[]
|
||||
.PP
|
||||
Updates the dotnetsay Global Tool located on a specific Windows folder:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ update\ dotnetsay\ \-\-tool\-path\ c:\\global\-tools\f[]
|
||||
.PP
|
||||
Updates the dotnetsay Global Tool located on a specific Linux/macOS folder:
|
||||
.PP
|
||||
\f[C]dotnet\ tool\ update\ dotnetsay\ \-\-tool\-path\ ~/bin\f[]
|
||||
.SS See also
|
||||
.PP
|
||||
\&.NET Core Global Tools
|
||||
.SH AUTHORS
|
||||
mairaw.
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>library</OutputType>
|
||||
<TargetFramework>netcoreapp2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="PrintWarning" BeforeTargets="CoreBuild">
|
||||
<Warning Text="NoWarn => $(NoWarn)"/>
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -6,6 +6,6 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreAllPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Channel>master</Channel>
|
||||
<BranchName>master</BranchName>
|
||||
<Channel>release/2.2.1xx</Channel>
|
||||
<BranchName>release/2.2.1xx</BranchName>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
($(Rid.StartsWith('rhel.6'))
|
||||
OR $(Rid.StartsWith('linux-musl'))
|
||||
OR $(Rid.StartsWith('fedora.27'))
|
||||
OR $(Rid.StartsWith('opensuse.43.2'))
|
||||
OR $(Rid.StartsWith('opensuse.42.3'))
|
||||
OR $(Rid.StartsWith('ubuntu.18.04')))">true</SkipBuildingInstallers>
|
||||
<SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' ">false</SkipBuildingInstallers>
|
||||
|
||||
|
|
@ -20,16 +20,18 @@
|
|||
AND '$(Rid)' != 'rhel.6-x64'
|
||||
AND '$(Rid)' != 'linux-musl-x64'
|
||||
AND '$(Rid)' != 'fedora.27-x64'
|
||||
AND '$(Rid)' != 'opensuse.43.2-x64'
|
||||
AND '$(Rid)' != 'opensuse.42.3-x64'
|
||||
AND '$(Rid)' != 'ubuntu.18.04-x64'">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>
|
||||
<HighEntropyVA>true</HighEntropyVA>
|
||||
|
||||
<!-- Only use asset target fallback that we set (not implicit one to net461). -->
|
||||
<DisableImplicitAssetTargetFallback>true</DisableImplicitAssetTargetFallback>
|
||||
|
||||
<!-- Disable asset target fallback warning globally since it does not work transitively on NoWarn of individual packages -->
|
||||
<!-- NU1701: Disable asset target fallback warning globally since it does not work transitively on NoWarn of individual packages -->
|
||||
<!-- Since we disabled the implict fallback to net461, this will only kick in when we have an explicit fallback and we don't need to be warned about it doing what we asked it to do. -->
|
||||
<NoWarn>NU1701</NoWarn>
|
||||
<!-- NU5104: Disable 'A stable release of a package should not have a prerelease dependency' warning globally -->
|
||||
<!-- The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' throws a "NU5104" warning/error while using a "2.1.300" stage0 SDK. For: Linux-x64, Linux-arm, and Linux-arm64 -->
|
||||
<NoWarn>NU1701;NU5104</NoWarn>
|
||||
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -13,12 +13,11 @@
|
|||
Condition="!Exists('$(DotnetToolsNuPkgPath)/$(TemplateFillInPackageName.ToLower())')">
|
||||
|
||||
<PropertyGroup>
|
||||
<DotnetToolsRestoreAdditionalParameters>--runtime any</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters>--runtime any /p:RestoreProjectStyle=DotnetToolReference</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters>$(DotnetToolsRestoreAdditionalParameters) /p:TargetFramework=$(CliTargetFramework)</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters>$(DotnetToolsRestoreAdditionalParameters) /p:TemplateFillInPackageName=$(TemplateFillInPackageName)</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters>$(DotnetToolsRestoreAdditionalParameters) /p:TemplateFillInPackageVersion=$(TemplateFillInPackageVersion)</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters>$(DotnetToolsRestoreAdditionalParameters) /p:RestorePackagesPath=$(DotnetToolsLayoutDirectory)</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters Condition=" $(DotnetToolsRestoreProjectStyle) != '' " >$(DotnetToolsRestoreAdditionalParameters) /p:RestoreProjectStyle=$(DotnetToolsRestoreProjectStyle)</DotnetToolsRestoreAdditionalParameters>
|
||||
</PropertyGroup>
|
||||
|
||||
<DotNetRestore ToolPath="$(PreviousStageDirectory)"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
|
||||
<BundledDotnetTools Include="dotnet-dev-certs" Version="$(AspNetCoreVersion)" />
|
||||
<BundledDotnetTools Include="dotnet-ef" Version="$(AspNetCoreVersion)" ObsoletesCliTool="Microsoft.EntityFrameworkCore.Tools.DotNet" />
|
||||
<BundledDotnetTools Include="dotnet-sql-cache" Version="$(AspNetCoreVersion)" ObsoletesCliTool="Microsoft.Extensions.Caching.SqlConfig.Tools" />
|
||||
<BundledDotnetTools Include="dotnet-user-secrets" Version="$(AspNetCoreVersion)" ObsoletesCliTool="Microsoft.Extensions.SecretManager.Tools" />
|
||||
<BundledDotnetTools Include="dotnet-watch" Version="$(AspNetCoreVersion)" ObsoletesCliTool="Microsoft.DotNet.Watcher.Tools" />
|
||||
<BundledDotnetTools Include="dotnet-dev-certs" Version="$(DotnetDevCertsPackageVersion)" />
|
||||
<BundledDotnetTools Include="dotnet-ef" Version="$(DotnetEfPackageVersion)" ObsoletesCliTool="Microsoft.EntityFrameworkCore.Tools.DotNet" />
|
||||
<BundledDotnetTools Include="dotnet-sql-cache" Version="$(DotnetSqlCachePackageVersion)" ObsoletesCliTool="Microsoft.Extensions.Caching.SqlConfig.Tools" />
|
||||
<BundledDotnetTools Include="dotnet-user-secrets" Version="$(DotnetUserSecretsPackageVersion)" ObsoletesCliTool="Microsoft.Extensions.SecretManager.Tools" />
|
||||
<BundledDotnetTools Include="dotnet-watch" Version="$(DotnetWatchPackageVersion)" ObsoletesCliTool="Microsoft.DotNet.Watcher.Tools" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -7,20 +7,20 @@
|
|||
<InstallerStartSuffix Condition="'$(HostOSName)' == 'osx'">-internal</InstallerStartSuffix>
|
||||
|
||||
<!-- Downloaded Installers + Archives -->
|
||||
<DownloadedRuntimeDepsInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerEndSuffix)$(InstallerExtension)</DownloadedRuntimeDepsInstallerFileName>
|
||||
<DownloadedRuntimeDepsInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension)</DownloadedRuntimeDepsInstallerFileName>
|
||||
<DownloadedRuntimeDepsInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedRuntimeDepsInstallerFileName)</DownloadedRuntimeDepsInstallerFile>
|
||||
|
||||
<!-- Use the "x64" Rid when downloading Linux shared framework 'DEB' installer files. -->
|
||||
<SharedFrameworkInstallerFileRid>$(CoreSetupRid)</SharedFrameworkInstallerFileRid>
|
||||
<SharedFrameworkInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' ">x64</SharedFrameworkInstallerFileRid>
|
||||
|
||||
<DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerEndSuffix)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
|
||||
<DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
|
||||
<DownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName)</DownloadedSharedHostInstallerFile>
|
||||
|
||||
<DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerEndSuffix)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
|
||||
<DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
|
||||
<DownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName)</DownloadedHostFxrInstallerFile>
|
||||
|
||||
<DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerEndSuffix)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
|
||||
<DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
|
||||
<DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
|
||||
|
||||
<!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
<AspNetCoreSharedFxArchiveRid>$(AspNetCoreSharedFxInstallerRid)</AspNetCoreSharedFxArchiveRid>
|
||||
<AspNetCoreSharedFxInstallerRid Condition="'$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm'">x64</AspNetCoreSharedFxInstallerRid>
|
||||
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' != '' AND '$(HostOSName)' != 'osx' ">aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerEndSuffix)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' != '' AND '$(HostOSName)' != 'osx' ">aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<!-- Note: we use the "-internal" archives and installers that contain only the aspnetcore shared framework, and shouldn't overlap with Microsoft.NETCore.App. -->
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<DownloadedAspNetCoreSharedFxInstallerFile Condition=" '$(InstallerExtension)' != '' AND '$(DownloadedAspNetCoreSharedFxInstallerFileName)' != '' ">$(PackagesDirectory)/$(DownloadedAspNetCoreSharedFxInstallerFileName)</DownloadedAspNetCoreSharedFxInstallerFile>
|
||||
|
|
|
|||
|
|
@ -7,5 +7,7 @@
|
|||
<BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspNetCoreVersion)" />
|
||||
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" Version="$(AspNetCoreVersion)" />
|
||||
<BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(AspNetCoreVersion)" />
|
||||
|
||||
<BundledTemplate Include="NUnit3.DotNetNew.Template" Version="$(NUnit3TemplatesVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -4,40 +4,47 @@
|
|||
<ToolsetVersion>3.0.100-alpha1-009033</ToolsetVersion>
|
||||
<MicrosoftAspNetCoreAllPackageVersion>3.0.0-alpha1-10062</MicrosoftAspNetCoreAllPackageVersion>
|
||||
<MicrosoftAspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</MicrosoftAspNetCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26710-03</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</MicrosoftAspNetCoreMvcPackageVersion>
|
||||
<DotnetEfPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</DotnetEfPackageVersion>
|
||||
<DotnetDevCertsPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</DotnetDevCertsPackageVersion>
|
||||
<DotnetSqlCachePackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)/DotnetSqlCachePackageVersion>
|
||||
<DotnetUserSecretsPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</DotnetUserSecretsPackageVersion>
|
||||
<DotnetWatchPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</DotnetWatchPackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>2.2.0-preview1-26529-01</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftBuildPackageVersion>15.8.0-preview-000060</MicrosoftBuildPackageVersion>
|
||||
<MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
|
||||
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
|
||||
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
|
||||
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
|
||||
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
|
||||
<MicrosoftFSharpCompilerPackageVersion>10.1.4-rtm-180515-0</MicrosoftFSharpCompilerPackageVersion>
|
||||
<MicrosoftCodeAnalysisCSharpPackageVersion>2.8.3-beta6-63029-08</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||
<MicrosoftFSharpCompilerPackageVersion>10.2.2-rtm-180720-0</MicrosoftFSharpCompilerPackageVersion>
|
||||
<MicrosoftCodeAnalysisCSharpPackageVersion>2.9.0-beta8-63119-10</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
||||
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
|
||||
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
||||
<MicrosoftNetCompilersNetcorePackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNetCompilersNetcorePackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>1.0.0-preview1-62924-06</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>2.2.100-preview1-63118-02</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftNETSdkRazorPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</MicrosoftNETSdkRazorPackageVersion>
|
||||
<MicrosoftNETSdkWebPackageVersion>2.1.300-rtm-20180515-1688249</MicrosoftNETSdkWebPackageVersion>
|
||||
<MicrosoftNETSdkRazorPackageVersion>2.1.1</MicrosoftNETSdkRazorPackageVersion>
|
||||
<MicrosoftNETSdkWebPackageVersion>2.1.400-preview1-20180705-1834985</MicrosoftNETSdkWebPackageVersion>
|
||||
<MicrosoftNETSdkPublishPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkPublishPackageVersion>
|
||||
<MicrosoftNETSdkWebProjectSystemPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWebProjectSystemPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta3-20180515-1688254</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates20PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates20PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates20PackageVersion>1.0.2-beta3-20180515-1688254</MicrosoftDotNetTestProjectTemplates20PackageVersion>
|
||||
<MicrosoftTemplateEngineCliPackageVersion>1.0.2-beta3-20180515-1688254</MicrosoftTemplateEngineCliPackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates20PackageVersion>1.0.2-beta3-20180716-1864993</MicrosoftDotNetTestProjectTemplates20PackageVersion>
|
||||
<MicrosoftTemplateEngineCliPackageVersion>1.0.2-beta3</MicrosoftTemplateEngineCliPackageVersion>
|
||||
<MicrosoftTemplateEngineAbstractionsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineAbstractionsPackageVersion>
|
||||
<MicrosoftTemplateEngineCliLocalizationPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineCliLocalizationPackageVersion>
|
||||
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
|
||||
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
|
||||
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview1-26710-03</MicrosoftDotNetPlatformAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview1-26710-03</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftDotNetCliCommandLinePackageVersion>0.1.1-rtm-62915-03</MicrosoftDotNetCliCommandLinePackageVersion>
|
||||
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.3.1-rtm-62915-03</MicrosoftDotNetProjectJsonMigrationPackageVersion>
|
||||
<MicrosoftDotNetCliCommandLinePackageVersion>0.1.1</MicrosoftDotNetCliCommandLinePackageVersion>
|
||||
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.3.1</MicrosoftDotNetProjectJsonMigrationPackageVersion>
|
||||
<MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion>
|
||||
<MicrosoftDotNetArchivePackageVersion>0.2.0-beta-62628-01</MicrosoftDotNetArchivePackageVersion>
|
||||
<NuGetBuildTasksPackageVersion>4.8.0-preview3.5244</NuGetBuildTasksPackageVersion>
|
||||
<MicrosoftDotNetArchivePackageVersion>0.2.0-beta-63027-01</MicrosoftDotNetArchivePackageVersion>
|
||||
<NuGetBuildTasksPackageVersion>4.8.0-rtm.5348</NuGetBuildTasksPackageVersion>
|
||||
<NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
|
||||
<NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
|
||||
<NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>
|
||||
|
|
@ -47,12 +54,15 @@
|
|||
<NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
|
||||
<NuGetVersioningPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetVersioningPackageVersion>
|
||||
<NuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetSdkResolverPackageVersion>
|
||||
<MicrosoftNETTestSdkPackageVersion>15.8.0-preview-20180510-03</MicrosoftNETTestSdkPackageVersion>
|
||||
<MicrosoftNETTestSdkPackageVersion>15.8.0</MicrosoftNETTestSdkPackageVersion>
|
||||
<MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
|
||||
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
|
||||
<MicrosoftDotNetCliUtilsPackageVersion>3.0.100-alpha1-20180711-1</MicrosoftDotNetCliUtilsPackageVersion>
|
||||
<XliffTasksPackageVersion>0.2.0-beta-000042</XliffTasksPackageVersion>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
<MSTestVersion>1.3.2</MSTestVersion>
|
||||
<XUnitVersion>2.3.1</XUnitVersion>
|
||||
<NUnit3TemplatesVersion>1.5.1</NUnit3TemplatesVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- NOTE: The property group above is in alignment with orchestrated build version naming conventions. -->
|
||||
|
|
|
|||
|
|
@ -32,6 +32,13 @@
|
|||
<_AspNetCoreAllPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</_AspNetCoreAllPackageVersion>
|
||||
<_AspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</_AspNetCoreAppPackageVersion>
|
||||
|
||||
<!-- Default aspnetcore patch versions, specified as a stabilized version -->
|
||||
<_DefaultPatchVersionForAspNetCoreAll2_1>2.1.1</_DefaultPatchVersionForAspNetCoreAll2_1>
|
||||
<_DefaultPatchVersionForAspNetCoreApp2_1>$(_DefaultPatchVersionForAspNetCoreAll2_1)</_DefaultPatchVersionForAspNetCoreApp2_1>
|
||||
<!-- If we are currently building a prerelease of the version that we intend to lock to, set the default version to the ingested version instead of the stabilized version. -->
|
||||
<_DefaultPatchVersionForAspNetCoreAll2_1 Condition="$(_AspNetCoreAllPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreAll2_1)-'))">$(_AspNetCoreAllPackageVersion)</_DefaultPatchVersionForAspNetCoreAll2_1>
|
||||
<_DefaultPatchVersionForAspNetCoreApp2_1 Condition="$(_AspNetCoreAppPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreApp2_1)-'))">$(_AspNetCoreAppPackageVersion)</_DefaultPatchVersionForAspNetCoreApp2_1>
|
||||
|
||||
<!-- Use only major and minor in target framework version -->
|
||||
<_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>
|
||||
<_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion>
|
||||
|
|
@ -41,6 +48,16 @@
|
|||
<_NETCoreSdkIsPreview Condition=" '$(DropSuffix)' != 'true' ">true</_NETCoreSdkIsPreview>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
Setting the property to true if patch == 0 and preview == true. SDK will set DefaultNetCorePatchVersion according to this flag.
|
||||
So that we don't need to manually update the version selection logic between when we ship a final release and when we ship the first patch
|
||||
-->
|
||||
<GetUseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion
|
||||
BundledNETCoreAppPackageVersion="$(_NETCoreAppPackageVersion)">
|
||||
<Output TaskParameter="UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion"
|
||||
PropertyName="_UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion" />
|
||||
</GetUseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion>
|
||||
|
||||
<ItemGroup>
|
||||
<BundledVersionsVariable Include="BundledAspNetCoreAllTargetFrameworkVersion" Value="$(_AspNetCoreAllTargetFrameworkVersion)" />
|
||||
<BundledVersionsVariable Include="BundledAspNetCoreAllPackageVersion" Value="$(_AspNetCoreAllPackageVersion)" />
|
||||
|
|
@ -80,6 +97,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
<NETCoreAppMaximumVersion>$(_NETCoreAppTargetFrameworkVersion)</NETCoreAppMaximumVersion>
|
||||
<BundledNETCoreAppTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion)</BundledNETCoreAppTargetFrameworkVersion>
|
||||
<BundledNETCoreAppPackageVersion>$(_NETCoreAppPackageVersion)</BundledNETCoreAppPackageVersion>
|
||||
<UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion>$(_UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion)</UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion>
|
||||
<BundledNETStandardTargetFrameworkVersion>$(_NETStandardTargetFrameworkVersion)</BundledNETStandardTargetFrameworkVersion>
|
||||
<BundledNETStandardPackageVersion>$(_NETStandardLibraryPackageVersion)</BundledNETStandardPackageVersion>
|
||||
<BundledNETCorePlatformsPackageVersion>$(_NETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
|
||||
|
|
@ -87,10 +105,14 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
<NETCoreSdkVersion>$(SdkVersion)</NETCoreSdkVersion>
|
||||
<_NETCoreSdkIsPreview>$(_NETCoreSdkIsPreview)</_NETCoreSdkIsPreview>
|
||||
|
||||
<!-- Default patch versions for each minor version of ASP.NET Core -->
|
||||
<DefaultPatchVersionForAspNetCoreAll2_1>$(_DefaultPatchVersionForAspNetCoreAll2_1)</DefaultPatchVersionForAspNetCoreAll2_1>
|
||||
<DefaultPatchVersionForAspNetCoreApp2_1>$(_DefaultPatchVersionForAspNetCoreApp2_1)</DefaultPatchVersionForAspNetCoreApp2_1>
|
||||
|
||||
<!-- Latest patch versions for each minor version of .NET Core -->
|
||||
<LatestPatchVersionForNetCore1_0 Condition="'$(LatestPatchVersionForNetCore1_0)' == ''">1.0.11</LatestPatchVersionForNetCore1_0>
|
||||
<LatestPatchVersionForNetCore1_1 Condition="'$(LatestPatchVersionForNetCore1_1)' == ''">1.1.8</LatestPatchVersionForNetCore1_1>
|
||||
<LatestPatchVersionForNetCore2_0 Condition="'$(LatestPatchVersionForNetCore2_0)' == ''">2.0.7</LatestPatchVersionForNetCore2_0>
|
||||
<LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">1.0.12</LatestPatchVersionForNetCore1_0>
|
||||
<LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">1.1.9</LatestPatchVersionForNetCore1_1>
|
||||
<LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">2.0.9</LatestPatchVersionForNetCore2_0>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
]]>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
<UsingTask TaskName="GenerateMsiVersion" AssemblyFile="$(CLIBuildDll)" />
|
||||
<UsingTask TaskName="GenerateNuGetPackagesArchiveVersion" AssemblyFile="$(CLIBuildDll)" />
|
||||
<UsingTask TaskName="GetCurrentRuntimeInformation" AssemblyFile="$(CLIBuildDll)" />
|
||||
<UsingTask TaskName="GetUseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion" AssemblyFile="$(CLIBuildDll)"/>
|
||||
<UsingTask TaskName="MakeRelative" AssemblyFile="$(CLIBuildDll)" />
|
||||
<UsingTask TaskName="RemoveAssetFromDepsPackages" AssemblyFile="$(CLIBuildDll)" />
|
||||
<UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(CLIBuildDll)" />
|
||||
|
|
|
|||
|
|
@ -24,18 +24,25 @@
|
|||
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
|
||||
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
|
||||
<add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
|
||||
<add key="websdk" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
|
||||
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
|
||||
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
|
||||
<add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
|
||||
<add key="dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
|
||||
<add key="container-tools" value="https://www.myget.org/F/container-tools-for-visual-studio/api/v3/index.json" />
|
||||
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||
<add key="linux-musl-bootstrap-feed" value="https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180420-03/aspnet-inputs/index.json" />
|
||||
<add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
|
||||
<add key="myget-vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
|
||||
]]>
|
||||
</NugetConfigCLIFeeds>
|
||||
|
||||
<NugetConfigSuffix>
|
||||
<![CDATA[
|
||||
</packageSources>
|
||||
<disabledPackageSources>
|
||||
<clear/>
|
||||
</disabledPackageSources>
|
||||
</configuration>
|
||||
]]>
|
||||
</NugetConfigSuffix>
|
||||
|
|
|
|||
|
|
@ -50,7 +50,9 @@
|
|||
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
|
||||
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr"
|
||||
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
|
||||
-->
|
||||
-->
|
||||
<ForPublishing Include="$(PackagesDirectory)/nuGetPackagesArchive.lzma"
|
||||
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<FinalArchive>$(SdkOutputDirectory)/nuGetPackagesArchive.lzma</FinalArchive>
|
||||
<PackagesArchive>$(PackagesDirectory)/nuGetPackagesArchive.lzma</PackagesArchive>
|
||||
<NugetPackagesArchiveName>nuGetPackagesArchive-$(AspNetCoreVersion).lzma</NugetPackagesArchiveName>
|
||||
<IntermediateArchive>$(IntermediateDirectory)/$(NugetPackagesArchiveName)</IntermediateArchive>
|
||||
<NugetPackagesArchiveBlobUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(NugetPackagesArchiveName)</NugetPackagesArchiveBlobUrl>
|
||||
|
|
@ -17,5 +18,6 @@
|
|||
ContinueOnError="WarnAndContinue" />
|
||||
|
||||
<Copy SourceFiles="$(IntermediateArchive)" DestinationFiles="$(FinalArchive)" />
|
||||
<Copy SourceFiles="$(IntermediateArchive)" DestinationFiles="$(PackagesArchive)" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
<Import Project="Installer.DEB.targets" />
|
||||
|
||||
<!-- Re-enable "TestSdkDeb" when the following issue is resolved: https://github.com/dotnet/cli/issues/9672 -->
|
||||
<Target Name="GenerateDebs"
|
||||
DependsOnTargets="SetupDebProps;
|
||||
TestDebuild;
|
||||
BuildSdkDeb;
|
||||
TestSdkDeb;"
|
||||
BuildSdkDeb"
|
||||
Condition=" '$(IsDebianBaseDistro)' == 'True' "
|
||||
Outputs="@(GeneratedInstallers)"/>
|
||||
|
||||
|
|
@ -100,11 +100,14 @@
|
|||
SkipUnchangedFiles="False"
|
||||
UseHardlinksIfPossible="False" />
|
||||
|
||||
<!-- Remove Shared Framework and Debian Packages -->
|
||||
<!-- Proactively remove all possible Shared Framework and Debian Packages -->
|
||||
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageFileName)" />
|
||||
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageFileName)" />
|
||||
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageFileName)" />
|
||||
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(RuntimeDepsPackageName)" />
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -32,8 +32,9 @@
|
|||
<SharedFxDebianPackageFileName>$(SharedFxDebianPackageFileName.ToLower())</SharedFxDebianPackageFileName>
|
||||
<SharedFxDebianPackageName>dotnet-runtime-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
|
||||
<SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
|
||||
<HostFxrDebianPackageVersion>$(HostFxrMajorMinorVersion)</HostFxrDebianPackageVersion>
|
||||
<HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
|
||||
<HostFxrDebianPackageFileName>dotnet-hostfxr-$(HostFxrVersion)</HostFxrDebianPackageFileName>
|
||||
<HostFxrDebianPackageFileName>$(HostFxrDebianPackageFileName.ToLower())</HostFxrDebianPackageFileName>
|
||||
<HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrMajorMinorVersion)</HostFxrDebianPackageName>
|
||||
<HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
|
||||
<HostDebianPackageName>dotnet-host</HostDebianPackageName>
|
||||
<AspNetCoreSharedFxDebianPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxDebianPackageFileName>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
<CombinedFrameworkSdkHostBundleEngineName>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)-engine.exe</CombinedFrameworkSdkHostBundleEngineName>
|
||||
|
||||
<SdkGenerateMsiPowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatemsi.ps1</SdkGenerateMsiPowershellScript>
|
||||
<SdkStableFileIdForApphostTransform>$(RepoRoot)/packaging/windows/clisdk/stablefileidforapphosttransform.xslt</SdkStableFileIdForApphostTransform>
|
||||
<SdkGenerateBundlePowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatebundle.ps1</SdkGenerateBundlePowershellScript>
|
||||
<SdkGenerateNupkgPowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatenupkg.ps1</SdkGenerateNupkgPowershellScript>
|
||||
|
||||
|
|
@ -113,7 +114,9 @@
|
|||
'$(SimpleVersion)'
|
||||
'$(NugetVersion)'
|
||||
'$(SdkInstallerUpgradeCode)'
|
||||
'$(Architecture)'" />
|
||||
'$(Architecture)'
|
||||
'$(SdkStableFileIdForApphostTransform)'
|
||||
" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateMSBuildExtensionsMsi"
|
||||
|
|
|
|||
|
|
@ -9,8 +9,9 @@
|
|||
<BuildRpmPackage Condition=" '$(IsRPMBasedDistro)' == 'True' ">True</BuildRpmPackage>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Re-enable "TestSdkRpm" when the following issue is resolved: https://github.com/dotnet/cli/issues/9672 -->
|
||||
<Target Name="GenerateRpms"
|
||||
DependsOnTargets="TestFPMTool;BuildRpms;TestSdkRpm"
|
||||
DependsOnTargets="TestFPMTool;BuildRpms"
|
||||
Condition=" '$(BuildRpmPackage)' == 'True' "
|
||||
Outputs="@(GeneratedInstallers)"/>
|
||||
|
||||
|
|
@ -242,7 +243,6 @@
|
|||
|
||||
<!-- Clean up Packages -->
|
||||
<Exec Command="sudo yum remove -y $(SdkRpmPackageName)" />
|
||||
|
||||
<Exec Command="sudo yum remove -y $(AspNetCoreSharedFxRpmPackageFileName)" />
|
||||
<Exec Command="sudo yum remove -y $(SharedFxRpmPackageFileName)" />
|
||||
<Exec Command="sudo yum remove -y $(HostFxrRpmPackageName)" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
// 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 Microsoft.Build.Utilities;
|
||||
using Microsoft.Build.Framework;
|
||||
using Microsoft.DotNet.Cli.Build.Framework;
|
||||
using NuGet.Versioning;
|
||||
|
||||
namespace Microsoft.DotNet.Cli.Build
|
||||
{
|
||||
public class GetUseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion : Task
|
||||
{
|
||||
[Required]
|
||||
public string BundledNETCoreAppPackageVersion { get; set; }
|
||||
|
||||
[Output]
|
||||
public string UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion { get; set; }
|
||||
|
||||
public override bool Execute()
|
||||
{
|
||||
var parsedVersion = NuGetVersion.Parse(BundledNETCoreAppPackageVersion);
|
||||
UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion =
|
||||
(parsedVersion.Patch == 0) && parsedVersion.IsPrerelease ? "true" : "false";
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
<xsl:stylesheet version="1.0"
|
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
xmlns:msxsl="urn:schemas-microsoft-com:xslt"
|
||||
exclude-result-prefixes="msxsl"
|
||||
xmlns:wix="http://schemas.microsoft.com/wix/2006/wi"
|
||||
xmlns:my="my:my">
|
||||
|
||||
<xsl:output method="xml" indent="yes" />
|
||||
|
||||
<xsl:strip-space elements="*"/>
|
||||
|
||||
<xsl:template match="@*|node()">
|
||||
<xsl:copy>
|
||||
<xsl:apply-templates select="@*|node()"/>
|
||||
</xsl:copy>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match='wix:Wix/wix:Fragment/wix:ComponentGroup/wix:Component/wix:File[contains(@Source, "AppHostTemplate\apphost.exe")]'>
|
||||
<xsl:copy>
|
||||
<xsl:apply-templates select="@*"/>
|
||||
<xsl:attribute name="Id">
|
||||
<xsl:text>apphosttemplateapphostexe</xsl:text>
|
||||
</xsl:attribute>
|
||||
</xsl:copy>
|
||||
</xsl:template>
|
||||
</xsl:stylesheet>
|
||||
|
|
@ -10,7 +10,8 @@ param(
|
|||
[Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
|
||||
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
|
||||
[Parameter(Mandatory=$true)][string]$UpgradeCode,
|
||||
[Parameter(Mandatory=$true)][string]$Architecture
|
||||
[Parameter(Mandatory=$true)][string]$Architecture,
|
||||
[Parameter(Mandatory=$true)][string]$StableFileIdForApphostTransform
|
||||
)
|
||||
|
||||
. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
|
||||
|
|
@ -26,7 +27,19 @@ function RunHeat
|
|||
|
||||
Write-Output Running heat..
|
||||
|
||||
.\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr DOTNETHOME -out $InstallFileswsx | Out-Host
|
||||
# -t $StableFileIdForApphostTransform to avoid sign check baseline apphost.exe name changes every build. Sign check uses File Id in MSI as whitelist name.
|
||||
# Template apphost.exe get a new "File Id" in msi different every time (since File Id is generated according to file
|
||||
# path, and file path has version number)
|
||||
# use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time.
|
||||
|
||||
.\heat.exe dir `"$inputDir`" -template fragment `
|
||||
-sreg -gg `
|
||||
-var var.DotnetSrc `
|
||||
-cg InstallFiles `
|
||||
-srd `
|
||||
-dr DOTNETHOME `
|
||||
-t $StableFileIdForApphostTransform `
|
||||
-out $InstallFileswsx | Out-Host
|
||||
|
||||
if($LastExitCode -ne 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -90,8 +90,8 @@ if($Architecture.StartsWith("arm", [StringComparison]::OrdinalIgnoreCase))
|
|||
$InstallArchitecture = "x64"
|
||||
}
|
||||
|
||||
Write-Output "$dotnetInstallPath -version ""2.2.0-preview1-007799"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
|
||||
Invoke-Expression "$dotnetInstallPath -version ""2.2.0-preview1-007799"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
|
||||
Write-Output "$dotnetInstallPath -version ""2.1.300"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
|
||||
Invoke-Expression "$dotnetInstallPath -version ""2.1.300"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
|
||||
|
||||
if ($LastExitCode -ne 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,6 +11,15 @@ RUN apk update && apk upgrade && apk add --no-cache curl ncurses
|
|||
# This Dockerfile doesn't use the USER_ID, but the parameter needs to be declared to prevent docker
|
||||
# from issuing a warning
|
||||
ARG USER_ID=0
|
||||
RUN adduser code_executor -u ${USER_ID} -G root -D
|
||||
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
# With the User Change, we need to change permssions on these directories
|
||||
RUN chmod -R a+rwx /usr/local
|
||||
RUN chmod -R a+rwx /home
|
||||
|
||||
# Set user to the one we just created
|
||||
USER ${USER_ID}
|
||||
|
||||
# Set working directory
|
||||
WORKDIR /opt/code
|
||||
|
|
|
|||
|
|
@ -48,9 +48,6 @@ namespace EndToEnd
|
|||
var restoredVersion = GetAspNetCoreAppVersion(assetsFile, portable: true);
|
||||
restoredVersion.Should().NotBeNull();
|
||||
|
||||
var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion");
|
||||
var bundledVersion = File.ReadAllText(bundledVersionPath).Trim();
|
||||
|
||||
restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion,
|
||||
"The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." +
|
||||
"Please update MSBuildExtensions.targets in this repo so these versions match.");
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
|
|||
.HaveStdOutContaining("Hello Portable World!");;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[Fact(Skip="https://github.com/dotnet/cli/issues/9688")]
|
||||
public void ItCanRunToolsThatPrefersTheCliRuntimeEvenWhenTheToolItselfDeclaresADifferentRuntime()
|
||||
{
|
||||
var testInstance = TestAssets.Get("MSBuildTestApp")
|
||||
|
|
@ -102,7 +102,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
|
|||
.And.HaveStdOutContaining("Hello I prefer the cli runtime World!");;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[Fact(Skip="https://github.com/dotnet/cli/issues/9688")]
|
||||
public void ItCanRunAToolThatInvokesADependencyToolInACSProj()
|
||||
{
|
||||
var repoDirectoriesProvider = new RepoDirectoriesProvider();
|
||||
|
|
|
|||
90
test/EndToEnd/GivenFrameworkDependentApps.cs
Normal file
90
test/EndToEnd/GivenFrameworkDependentApps.cs
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Xml.Linq;
|
||||
using FluentAssertions;
|
||||
using Microsoft.DotNet.PlatformAbstractions;
|
||||
using Microsoft.DotNet.TestFramework;
|
||||
using Microsoft.DotNet.Tools.Test.Utilities;
|
||||
using NuGet.ProjectModel;
|
||||
using NuGet.Versioning;
|
||||
using Xunit;
|
||||
|
||||
namespace EndToEnd
|
||||
{
|
||||
public class GivenFrameworkDependentApps : TestBase
|
||||
{
|
||||
[Theory]
|
||||
[ClassData(typeof(SupportedNetCoreAppVersions))]
|
||||
public void ItDoesNotRollForwardToTheLatestVersion(string minorVersion)
|
||||
{
|
||||
var _testInstance = TestAssets.Get("TestAppSimple")
|
||||
.CreateInstance(identifier: minorVersion)
|
||||
// scope the feed to only dotnet-core feed to avoid flaky when different feed has a newer / lower version
|
||||
.WithNuGetConfig(new RepoDirectoriesProvider().TestPackages)
|
||||
.WithSourceFiles();
|
||||
|
||||
string projectDirectory = _testInstance.Root.FullName;
|
||||
|
||||
string projectPath = Path.Combine(projectDirectory, "TestAppSimple.csproj");
|
||||
|
||||
var project = XDocument.Load(projectPath);
|
||||
var ns = project.Root.Name.Namespace;
|
||||
|
||||
// Update TargetFramework to the right version of .NET Core
|
||||
project.Root.Element(ns + "PropertyGroup")
|
||||
.Element(ns + "TargetFramework")
|
||||
.Value = "netcoreapp" + minorVersion;
|
||||
|
||||
project.Save(projectPath);
|
||||
|
||||
// Get the resolved version of .NET Core
|
||||
new RestoreCommand()
|
||||
.WithWorkingDirectory(projectDirectory)
|
||||
.Execute()
|
||||
.Should().Pass();
|
||||
|
||||
string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
|
||||
var assetsFile = new LockFileFormat().Read(assetsFilePath);
|
||||
|
||||
var versionInAssertsJson = GetNetCoreAppVersion(assetsFile);
|
||||
versionInAssertsJson.Should().NotBeNull();
|
||||
|
||||
if (versionInAssertsJson.IsPrerelease && versionInAssertsJson.Patch == 0)
|
||||
{
|
||||
// if the bundled version is, for example, a prerelease of
|
||||
// .NET Core 2.1.1, that we don't roll forward to that prerelease
|
||||
// version for framework-dependent deployments.
|
||||
return;
|
||||
}
|
||||
|
||||
versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(minorVersion));
|
||||
}
|
||||
|
||||
private NuGetVersion GetNetCoreAppVersion(LockFile lockFile)
|
||||
{
|
||||
return lockFile?.Targets?.SingleOrDefault(t => t.RuntimeIdentifier == null)
|
||||
?.Libraries?.SingleOrDefault(l =>
|
||||
string.Compare(l.Name, "Microsoft.NETCore.App", StringComparison.CurrentCultureIgnoreCase) == 0)
|
||||
?.Version;
|
||||
}
|
||||
|
||||
public string GetExpectedVersion(string minorVersion)
|
||||
{
|
||||
if (minorVersion.StartsWith("1.0"))
|
||||
{
|
||||
return "1.0.5"; // special case for 1.0
|
||||
}
|
||||
else if (minorVersion.StartsWith("1.1"))
|
||||
{
|
||||
return "1.1.2"; // special case for 1.1
|
||||
}
|
||||
else
|
||||
{
|
||||
var parsed = NuGetVersion.Parse(minorVersion);
|
||||
return new NuGetVersion(parsed.Major, parsed.Minor, 0).ToNormalizedString();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
|
|
@ -14,15 +13,22 @@ using Xunit;
|
|||
|
||||
namespace EndToEnd
|
||||
{
|
||||
public class GivenSelfContainedAppsRollForward : TestBase
|
||||
public partial class GivenSelfContainedAppsRollForward : TestBase
|
||||
{
|
||||
|
||||
[Theory(Skip = "Runtime 1.1 support for openSUSE and Fedora 27 needed")]
|
||||
[Theory]
|
||||
// MemberData is used instead of InlineData here so we can access it in another test to
|
||||
// verify that we are covering the latest release of .NET Core
|
||||
[MemberData(nameof(SupportedNetCoreAppVersions))]
|
||||
[ClassData(typeof(SupportedNetCoreAppVersions))]
|
||||
public void ItRollsForwardToTheLatestVersion(string minorVersion)
|
||||
{
|
||||
// https://github.com/dotnet/cli/issues/9661: remove this once the ASP.NET version bump
|
||||
// merges from 2.1.3xx -> 2.1.4xx -> 2.2.1xx
|
||||
if (minorVersion == "2.1")
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var _testInstance = TestAssets.Get("TestAppSimple")
|
||||
.CreateInstance(identifier: minorVersion)
|
||||
.WithSourceFiles();
|
||||
|
|
@ -119,8 +125,8 @@ namespace EndToEnd
|
|||
.Element(ns + "TargetFramework")
|
||||
.Value;
|
||||
|
||||
SupportedNetCoreAppVersions.Select(v => $"netcoreapp{v[0]}")
|
||||
.Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)} property should include the default version " +
|
||||
SupportedNetCoreAppVersions.Versions.Select(v => $"netcoreapp{v[0]}")
|
||||
.Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)}.{nameof(SupportedNetCoreAppVersions.Versions)} property should include the default version " +
|
||||
"of .NET Core created by \"dotnet new\"");
|
||||
|
||||
}
|
||||
|
|
|
|||
26
test/EndToEnd/SupportedNetCoreAppVersions.cs
Normal file
26
test/EndToEnd/SupportedNetCoreAppVersions.cs
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Xunit;
|
||||
|
||||
namespace EndToEnd
|
||||
{
|
||||
public class SupportedNetCoreAppVersions : IEnumerable<object[]>
|
||||
{
|
||||
public IEnumerator<object[]> GetEnumerator() => Versions.GetEnumerator();
|
||||
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
|
||||
public static IEnumerable<object[]> Versions
|
||||
{
|
||||
get
|
||||
{
|
||||
return new[]
|
||||
{
|
||||
"1.0",
|
||||
"1.1",
|
||||
"2.0",
|
||||
"2.1"
|
||||
}.Select(version => new object[] { version });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -117,7 +117,7 @@ namespace Microsoft.DotNet.TestFramework
|
|||
var content = @"<?xml version=""1.0"" encoding=""utf-8""?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<add key=""dotnet-core"" value=""https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"" />
|
||||
<add key=""dotnet-core"" value=""https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json"" />
|
||||
<add key=""test-packages"" value=""$fullpath$"" />
|
||||
</packageSources>
|
||||
</configuration>";
|
||||
|
|
|
|||
25
test/dotnet-test.Tests/CollectCodeCoverage.runsettings
Normal file
25
test/dotnet-test.Tests/CollectCodeCoverage.runsettings
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<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…
Add table
Reference in a new issue