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

Apply code review feedback

Browse source
This commit is contained in:
Daniel Plaisted 2020-10-26 20:18:09 -07:00
parent 9ec9fce35e
commit c5bc07d915
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/redist/targets/GenerateBundledVersions.targets
View file

@ -28,7 +28,8 @@
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion> <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion> <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
<!-- TODO: Once .NET 5.0 has released, update these version numbers to 5.0.0 --> <!-- TODO: Once .NET 5.0 has released, update these version numbers to 5.0.0
https://github.com/dotnet/installer/issues/8974 -->
<_NET50DefaultRuntimeFrameworkVersion>5.0.0-rc.2.20475.5</_NET50DefaultRuntimeFrameworkVersion> <_NET50DefaultRuntimeFrameworkVersion>5.0.0-rc.2.20475.5</_NET50DefaultRuntimeFrameworkVersion>
<_NET50RuntimePackVersion>5.0.0-rc.2.20475.5</_NET50RuntimePackVersion> <_NET50RuntimePackVersion>5.0.0-rc.2.20475.5</_NET50RuntimePackVersion>
<_NET50TargetingPackVersion>5.0.0-rc.2.20475.5</_NET50TargetingPackVersion> <_NET50TargetingPackVersion>5.0.0-rc.2.20475.5</_NET50TargetingPackVersion>
@ -113,7 +114,7 @@
" /> " />
<Net50Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64" /> <Net50Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64" />
<Crossgen2SupportedRids Include="@(Crossgen2SupportedRids)" /> <Crossgen2SupportedRids Include="@(Net50Crossgen2SupportedRids)" />
<AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" /> <AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
<AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);win-arm64" /> <AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);win-arm64" />

1
test/EndToEnd/ProjectBuildTests.cs
View file

@ -14,6 +14,7 @@ namespace EndToEnd.Tests
public class ProjectBuildTests : TestBase public class ProjectBuildTests : TestBase
{ {
// TODO: Once console template is updated to target net6.0, remove this logic // TODO: Once console template is updated to target net6.0, remove this logic
// https://github.com/dotnet/installer/issues/8974
void RetargetProject(string projectDirectory) void RetargetProject(string projectDirectory)
{ {
var projectFile = Directory.GetFiles(projectDirectory, "*.csproj").Single(); var projectFile = Directory.GetFiles(projectDirectory, "*.csproj").Single();