Merge branch 'release/2.1.2xx' into merges/release/2.1.1xx-to-release/2.1.2xx
This commit is contained in:
Livar
GitHub
commit
721c068376
35 changed files with 113 additions and 85 deletions
62
README.md
62
README.md
|
|
@ -9,7 +9,7 @@ Looking for V1 of the .NET Core tooling?
|
|||
|
||||
If you are looking for the v1.0.1 release of the .NET Core tools (CLI, MSBuild and the new csproj), see https://dot.net/core.
|
||||
|
||||
> **Note:** the release/2.1.1xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the
|
||||
> **Note:** the release/2.1.2xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the
|
||||
> released version of the tools available at https://dot.net/core
|
||||
|
||||
Found an issue?
|
||||
|
|
@ -64,7 +64,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/
|
|||
> **Note:** Be aware that the following installers are the **latest bits**. If you
|
||||
> want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling).
|
||||
|
||||
| Platform | Latest Daily Build<br>*release/2.1.1xx*<br>[![][version-badge]][version] |
|
||||
| Platform | Latest Daily Build<br>*release/2.1.2xx*<br>[![][version-badge]][version] |
|
||||
| -------- | :-------------------------------------: |
|
||||
| **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]<br>[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] |
|
||||
| **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]<br>[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] |
|
||||
|
|
@ -80,7 +80,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/
|
|||
| **OpenSUSE 42.1** | tar.gz - See **Linux x64** |
|
||||
|
||||
|
||||
| Latest Coherent Build<sup>2</sup><br>*release/2.1.1xx* |
|
||||
| Latest Coherent Build<sup>2</sup><br>*release/2.1.2xx* |
|
||||
|:------:|
|
||||
| [![][coherent-version-badge]][coherent-version] |
|
||||
|
||||
|
|
@ -89,43 +89,43 @@ Reference notes:
|
|||
> <br><br>**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.*
|
||||
|
||||
[comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.)
|
||||
[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/latest.version
|
||||
[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/win_x64_Release_version_badge.svg
|
||||
[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/latest.coherent.version
|
||||
[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/win_x86_Release_coherent_badge.svg
|
||||
[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/latest.version
|
||||
[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/win_x64_Release_version_badge.svg
|
||||
[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/latest.coherent.version
|
||||
[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/win_x86_Release_coherent_badge.svg
|
||||
|
||||
[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x64.exe
|
||||
[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x64.exe.sha
|
||||
[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x64.zip
|
||||
[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x64.zip.sha
|
||||
[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-win-x64.exe
|
||||
[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-win-x64.exe.sha
|
||||
[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-win-x64.zip
|
||||
[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-win-x64.zip.sha
|
||||
|
||||
[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x86.exe
|
||||
[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x86.exe.sha
|
||||
[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x86.zip
|
||||
[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x86.zip.sha
|
||||
[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-win-x86.exe
|
||||
[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-win-x86.exe.sha
|
||||
[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-win-x86.zip
|
||||
[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-win-x86.zip.sha
|
||||
|
||||
[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-osx-x64.pkg
|
||||
[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-osx-x64.pkg.sha
|
||||
[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-osx-x64.tar.gz
|
||||
[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-osx-x64.tar.gz.sha
|
||||
[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-osx-x64.pkg
|
||||
[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-osx-x64.pkg.sha
|
||||
[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-osx-x64.tar.gz
|
||||
[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-osx-x64.tar.gz.sha
|
||||
|
||||
[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-linux-x64.tar.gz
|
||||
[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-linux-x64.tar.gz.sha
|
||||
[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-linux-x64.tar.gz
|
||||
[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-linux-x64.tar.gz.sha
|
||||
|
||||
[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu-x64.deb
|
||||
[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu-x64.deb.sha
|
||||
[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-ubuntu-x64.deb
|
||||
[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-ubuntu-x64.deb.sha
|
||||
|
||||
[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu.16.04-x64.deb
|
||||
[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha
|
||||
[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-ubuntu.16.04-x64.deb
|
||||
[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha
|
||||
|
||||
[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu.16.10-x64.deb
|
||||
[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha
|
||||
[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-ubuntu.16.10-x64.deb
|
||||
[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha
|
||||
|
||||
[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-debian-x64.deb
|
||||
[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-debian-x64.deb.sha
|
||||
[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-debian-x64.deb
|
||||
[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-debian-x64.deb.sha
|
||||
|
||||
[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-rhel-x64.rpm
|
||||
[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-rhel-x64.rpm.sha
|
||||
[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-rhel-x64.rpm
|
||||
[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.2xx/dotnet-sdk-latest-rhel-x64.rpm.sha
|
||||
|
||||
# Debian daily feed
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<Channel>release/2.1.1xx</Channel>
|
||||
<BranchName>release/2.1.1xx</BranchName>
|
||||
<Channel>release/2.1.2xx</Channel>
|
||||
<BranchName>release/2.1.2xx</BranchName>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<Project ToolsVersion="14.0">
|
||||
<PropertyGroup>
|
||||
<SdkBrandName>Microsoft .NET Core SDK - 2.1.104</SdkBrandName>
|
||||
<SdkBrandName>Microsoft .NET Core SDK - 2.1.200</SdkBrandName>
|
||||
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
|
||||
<SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.6</SharedFrameworkBrandName>
|
||||
<SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
|
||||
|
|
|
|||
|
|
@ -3,23 +3,23 @@
|
|||
<PropertyGroup>
|
||||
<MicrosoftNETCoreAppPackageVersion>2.0.6</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftBuildPackageVersion>15.6.82</MicrosoftBuildPackageVersion>
|
||||
<MicrosoftBuildPackageVersion>15.7.0-preview-000127</MicrosoftBuildPackageVersion>
|
||||
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
|
||||
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
|
||||
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
|
||||
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
|
||||
<MicrosoftFSharpCompilerPackageVersion>10.1.4-rtm-180213-0</MicrosoftFSharpCompilerPackageVersion>
|
||||
<MicrosoftCodeAnalysisCSharpPackageVersion>2.7.0-beta3-62707-11</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||
<MicrosoftCodeAnalysisCSharpPackageVersion>2.8.0-beta3-62722-05</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
||||
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>2.1.100-preview-62721-01</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>2.1.200-preview-62803-04</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftNETSdkWebPackageVersion>2.0.0-rel-20171110-671</MicrosoftNETSdkWebPackageVersion>
|
||||
<MicrosoftNETSdkWebPackageVersion>2.0.0-rel-20180221-676</MicrosoftNETSdkWebPackageVersion>
|
||||
<MicrosoftNETSdkPublishPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkPublishPackageVersion>
|
||||
<MicrosoftNETSdkWebProjectSystemPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWebProjectSystemPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.0-beta3-20171117-314</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates20PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates20PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates20PackageVersion>1.0.1-beta3-20180227-1423531</MicrosoftDotNetTestProjectTemplates20PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates20PackageVersion>1.0.1-beta3-20180326-1520591</MicrosoftDotNetTestProjectTemplates20PackageVersion>
|
||||
<MicrosoftTemplateEngineAbstractionsPackageVersion>1.0.0-beta3-20171117-314</MicrosoftTemplateEngineAbstractionsPackageVersion>
|
||||
<MicrosoftTemplateEngineCliPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineCliPackageVersion>
|
||||
<MicrosoftTemplateEngineCliLocalizationPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineCliLocalizationPackageVersion>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.2.1-alpha-002133</MicrosoftDotNetProjectJsonMigrationPackageVersion>
|
||||
<MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion>
|
||||
<MicrosoftDiaSymReaderNativePackageVersion>1.6.0-beta2-25304</MicrosoftDiaSymReaderNativePackageVersion>
|
||||
<NuGetBuildTasksPackageVersion>4.6.2-rtm-5055</NuGetBuildTasksPackageVersion>
|
||||
<NuGetBuildTasksPackageVersion>4.7.0-preview3.5059</NuGetBuildTasksPackageVersion>
|
||||
<NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
|
||||
<NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
|
||||
<NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
<NuGetPackagingPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetPackagingPackageVersion>
|
||||
<NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
|
||||
<NuGetVersioningPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetVersioningPackageVersion>
|
||||
<MicrosoftNETTestSdkPackageVersion>15.6.0</MicrosoftNETTestSdkPackageVersion>
|
||||
<MicrosoftNETTestSdkPackageVersion>15.7.0-preview-20180320-02</MicrosoftNETTestSdkPackageVersion>
|
||||
<MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
|
||||
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
|
||||
<XliffTasksPackageVersion>0.2.0-beta-000042</XliffTasksPackageVersion>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
<add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
|
||||
<add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
|
||||
<add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
|
||||
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
|
||||
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
|
||||
<add key="symreader-native" value="https://dotnet.myget.org/f/symreader-native/api/v3/index.json" />
|
||||
<add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
|
||||
|
|
@ -32,7 +33,7 @@
|
|||
<add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
|
||||
<add key="AspNetMaster" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
|
||||
<add key="AspNetDev" value="https://dotnet.myget.org/F/aspnetcore-dev/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" />
|
||||
]]>
|
||||
</NugetConfigCLIFeeds>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionMajor>2</VersionMajor>
|
||||
<VersionMinor>1</VersionMinor>
|
||||
<VersionPatch>104</VersionPatch>
|
||||
<VersionPatch>200</VersionPatch>
|
||||
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
|
||||
|
||||
<CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
||||
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
|
||||
<Clean>False</Clean>
|
||||
<MsbuildArgs>/p:TargetFramework=netstandard1.5</MsbuildArgs>
|
||||
<MsbuildArgs>/p:TargetFramework=netstandard2.0</MsbuildArgs>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="src/Microsoft.DotNet.InternalAbstractions">
|
||||
<Name>Microsoft.DotNet.InternalAbstractions</Name>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div align="left" style="font-family: Helvetica;padding-left:10px">
|
||||
<p>The following was installed at /usr/local/share/dotnet</h2>
|
||||
<ul>
|
||||
<li>.NET Core SDK 2.1.104</li>
|
||||
<li>.NET Core SDK 2.1.200</li>
|
||||
<li>.NET Core Runtime 2.0.6</li>
|
||||
<li>Runtime Package Store</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
<String Id="FirstTimeWelcomeMessage">The installation was successful
|
||||
|
||||
The following were installed at [DOTNETHOME]
|
||||
• .NET Core SDK 2.1.104
|
||||
• .NET Core SDK 2.1.200
|
||||
• .NET Core Runtime 2.0.6
|
||||
• Runtime Package Store
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<PropertyGroup>
|
||||
<Description>SLN file reader/writer</Description>
|
||||
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
||||
<TargetFramework>netstandard1.6</TargetFramework>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<DebugType>portable</DebugType>
|
||||
<AssemblyName>Microsoft.DotNet.Cli.Sln.Internal</AssemblyName>
|
||||
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="System.Collections.Specialized" Version="4.0.1" />
|
||||
<PackageReference Include="System.Text.RegularExpressions" Version="4.1.0" />
|
||||
<PackageReference Include="NETStandard.Library" Version="1.6.0" />
|
||||
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
|
||||
<PackageReference Include="XliffTasks" Version="$(XliffTasksPackageVersion)" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<Version>$(SdkVersion)</Version>
|
||||
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
|
||||
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.5</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
|
||||
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFrameworks>
|
||||
<WarningsAsErrors>true</WarningsAsErrors>
|
||||
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
|
|
@ -24,15 +24,16 @@
|
|||
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
|
||||
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
|
||||
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
|
||||
<PackageReference Include="XliffTasks" Version="$(XliffTasksPackageVersion)" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
|
||||
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' ">
|
||||
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
|
||||
<PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
|
||||
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
||||
<TargetFramework>netstandard1.5</TargetFramework>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<WarningsAsErrors>true</WarningsAsErrors>
|
||||
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<PackageReference Include="NETStandard.Library" Version="1.6.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
|
||||
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' ">
|
||||
<PackageReference Include="System.AppContext" Version="4.1.0" />
|
||||
<PackageReference Include="System.Collections" Version="4.0.11" />
|
||||
<PackageReference Include="System.IO" Version="4.1.0" />
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
// NOTE: Currently, only the NET46 build ships (with Visual Studio/desktop msbuild),
|
||||
// but the netstandard1.5 adaptation here acts a proof-of-concept for cross-platform
|
||||
// portability of the underlying hostfxr API and gives us build and test coverage
|
||||
// on non-Windows machines.
|
||||
#if NETSTANDARD1_5
|
||||
// on non-Windows machines. It also ships with msbuild on Mono.
|
||||
#if NETSTANDARD2_0
|
||||
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
|
|
@ -50,4 +50,4 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
|
|||
}
|
||||
}
|
||||
|
||||
#endif // NETSTANDARD1_5
|
||||
#endif // NETSTANDARD2_0
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
|
|||
var environmentProvider = new EnvironmentProvider(_getEnvironmentVariable);
|
||||
var dotnetExe = environmentProvider.GetCommandPath("dotnet");
|
||||
|
||||
#if NETSTANDARD1_5
|
||||
#if NETSTANDARD2_0
|
||||
if (dotnetExe != null && !Interop.RunningOnWindows)
|
||||
{
|
||||
// e.g. on Linux the 'dotnet' command from PATH is a symlink so we need to
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<Version>$(SdkVersion)</Version>
|
||||
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
|
||||
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard1.5</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
|
||||
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
|
||||
<WarningsAsErrors>true</WarningsAsErrors>
|
||||
|
|
@ -20,11 +20,16 @@
|
|||
<PackageReference Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
|
||||
<PackageReference Include="NETStandard.Library" Version="1.6.0" />
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
|
||||
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="ResolveHostfxrCopyLocalContent" Condition="'$(TargetFramework)' == 'net46'" DependsOnTargets="ResolvePackageDependenciesForBuild" BeforeTargets="AssignTargetPaths">
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="ResolveHostfxrCopyLocalContent" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" DependsOnTargets="RunResolvePackageDependencies" BeforeTargets="AssignTargetPaths">
|
||||
<ItemGroup>
|
||||
<Content Include="@(FileDefinitions->'%(ResolvedPath)')" Condition="'%(FileDefinitions.Path)' == 'runtimes/win-x86/native/hostfxr.dll'">
|
||||
<Link>x86/hostfxr.dll</Link>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<PropertyGroup>
|
||||
<Description>Microsoft.DotNet.TestFramework Class Library</Description>
|
||||
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
||||
<TargetFramework>netstandard1.5</TargetFramework>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
||||
|
|
@ -14,4 +14,8 @@
|
|||
<ProjectReference Include="..\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NETStandard.Library" Version="2.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -32,6 +32,7 @@ namespace Microsoft.DotNet.Tools.Test
|
|||
{
|
||||
"/t:VSTest",
|
||||
"/v:quiet",
|
||||
"/nodereuse:false", // workaround for https://github.com/Microsoft/vstest/issues/1503
|
||||
"/nologo"
|
||||
};
|
||||
|
||||
|
|
@ -95,7 +96,23 @@ namespace Microsoft.DotNet.Tools.Test
|
|||
return e.ExitCode;
|
||||
}
|
||||
|
||||
return cmd.Execute();
|
||||
// Workaround for https://github.com/Microsoft/vstest/issues/1503
|
||||
const string NodeWindowEnvironmentName = "MSBUILDENSURESTDOUTFORTASKPROCESSES";
|
||||
string previousNodeWindowSetting = Environment.GetEnvironmentVariable(NodeWindowEnvironmentName);
|
||||
|
||||
int result = -1;
|
||||
|
||||
try
|
||||
{
|
||||
Environment.SetEnvironmentVariable(NodeWindowEnvironmentName, "1");
|
||||
result = cmd.Execute();
|
||||
}
|
||||
finally
|
||||
{
|
||||
Environment.SetEnvironmentVariable(NodeWindowEnvironmentName, previousNodeWindowSetting);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static string GetSemiColonEscapedString(string arg)
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
|
||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.3.0" />
|
||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
|
||||
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.0.0" />
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" />
|
||||
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<PackageReference Include="Microsoft.Deployment.WindowsInstaller" Version="1.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
|
||||
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
|
||||
<Reference Include="System.Runtime" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
<None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
|
||||
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
|
||||
<Reference Include="System.Core" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<Description>Microsoft.DotNet.Tools.Tests.Utilities Class Library</Description>
|
||||
<TargetFramework>netstandard1.5</TargetFramework>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<AssemblyName>Microsoft.DotNet.Tools.Tests.Utilities</AssemblyName>
|
||||
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
|
||||
<AssetTargetFallback>$(AssetTargetFallback);dotnet5.4;portable-net451+win8</AssetTargetFallback>
|
||||
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
|
||||
<NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
Loading…
Reference in a new issue