mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix merge errors

Browse source
This commit is contained in:
Nick Guerrera 2019-09-30 12:28:38 -07:00
parent 9154996a8b
commit b06c620cf2
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eng/Version.Details.xml
View file

@ -14,7 +14,9 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>e5ea848cf4173815a04921132e163e9e8ee17587</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0-preview1.19477.22">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>e5ea848cf4173815a04921132e163e9e8ee17587</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetAppHost" Version="3.1.0-preview1.19477.22">
<Uri>https://github.com/dotnet/core-setup</Uri>

2
eng/Versions.props
View file

@ -45,7 +45,7 @@
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.0-preview1.19477.22</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.1.0-preview1.19477.22/MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.1.0-preview1.19477.22</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>3.1.0-preview1.19477.22</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.0-preview1.19477.22</MicrosoftNETCoreDotNetHostResolverPackageVersion>

1
src/redist/targets/BundledTemplates.targets
View file

@ -129,7 +129,6 @@
<PackageDownload Update="Microsoft.DotNet.Web.ItemTemplates;Microsoft.DotNet.Web.Spa.ProjectTemplates"
Version="[$(AspNetCorePackageVersionFor21Templates)];
[$(AspNetCorePackageVersionFor22Templates)];
[$(AspNetCorePackageVersionFor30Templates)];
" />
<PackageDownload Update="NUnit3.DotNetNew.Template"