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

Merge pull request #10669 from dotnet/SDKScript-branding-301

Browse source 
Update branding for 5.0.3xx 5.0.3xx
This commit is contained in:
Sarah Oslund 2021-05-20 09:52:31 -07:00 • committed by GitHub
commit 6ae7526b22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eng/Versions.props
View file

@ -8,7 +8,7 @@
<VersionMajor>5</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>3</VersionSDKMinor>
<VersionFeature>00</VersionFeature>
<VersionFeature>01</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>

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

@ -24,7 +24,7 @@
</Target>
<PropertyGroup>
<VersionFeature21>$([MSBuild]::Add($(VersionFeature), 28))</VersionFeature21>
<VersionFeature21>$([MSBuild]::Add($(VersionFeature), 27))</VersionFeature21>
<VersionFeature31>$([MSBuild]::Add($(VersionFeature), 15))</VersionFeature31>
</PropertyGroup>

20
test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
View file

@ -3,6 +3,7 @@
using System;
using System.IO;
using System.Xml.Linq;
using EndToEnd;
using FluentAssertions;
using Microsoft.DotNet.Tools.Test.Utilities;
@ -48,7 +49,24 @@ namespace Microsoft.DotNet.Tests.EndToEnd
testProjectCreator.AdditionalProperties["OutputType"] = "exe";
testProjectCreator.AdditionalProperties["RuntimeIdentifier"] = Rid;
var testInstance = testProjectCreator.Create();
// At certain point of the release cycle LatestRuntimeFrameworkVersion in eng folder may not exist on the nuget feed
static void overrideLastRuntimeFrameworkVersionToExistingOlderVersion(XDocument project)
{
XNamespace ns = project.Root.Name.Namespace;
var target = XElement.Parse(@" <ItemGroup>
<KnownFrameworkReference Update=""@(KnownFrameworkReference)"">
<LatestRuntimeFrameworkVersion Condition=""'%(TargetFramework)' == 'netcoreapp3.1'"">3.1.10</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>
<KnownAppHostPack Update=""@(KnownAppHostPack)"">
<AppHostPackVersion Condition=""'%(TargetFramework)' == 'netcoreapp3.1'"">3.1.10</AppHostPackVersion>
</KnownAppHostPack>
</ItemGroup>");
target.Name = ns + target.Name.LocalName;
project.Root.Add(target);
}
TestFramework.TestAssetInstance testInstance
= testProjectCreator.Create().WithProjectChanges(overrideLastRuntimeFrameworkVersionToExistingOlderVersion);
new PublishCommand()
.WithWorkingDirectory(testInstance.Root.FullName)

25
test/SdkTests/TestConfig.xml
View file

@ -141,5 +141,30 @@
Skip="true"
Issue=""
Reason="Need all .NET core runtime"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
Skip="true"
Issue=""
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_a_single_file_including_pdbs"
Skip="true"
Issue=""
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASelfContainedApp.It_can_make_a_Windows_GUI_exe"
Skip="true"
Issue=""
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_can_include_ni_pdbs_in_single_file"
Skip="true"
Issue=""
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder"
Skip="true"
Issue=""
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
<Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.It_infers_WinExe_output_type"
Skip="true"
Issue=""
Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
</SkippedTests>
</Tests>