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

Minor formatting cleanup.

Browse source
This commit is contained in:
Michael Yanni 2023-11-13 15:19:16 -08:00
parent 32c3e4e8d0
commit b5323ace9b
3 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core-sdk-tasks/CalculateTemplateVersions.cs
View file

@ -28,7 +28,6 @@ namespace Microsoft.DotNet.Cli.Build
[Required]
public int CombinedBuildNumberAndRevision { get; set; }
// Should be the BundledTemplates with BundledTemplateInstallPath metadata set to the value calculated for that group
[Output]
public ITaskItem [] BundledTemplatesWithInstallPaths { get; set; }
@ -39,11 +38,10 @@ namespace Microsoft.DotNet.Cli.Build
// TemplatesMajorMinorVersion: 6.0 (from BundledTemplateMajorMinorVersion from group)
// InstallerUpgradeCode: Guid generated using GenerateGuidFromName, combining TemplateBaseFilename, FullNugetVersion, ProductMonikerRid, and InstallerExtension
// MSIVersion: Result of calling GenerateMsiVersionFromFullVersion logic with CombinedBuildNumberAndRevision and BundledTemplateMajorMinorPatchVersion from template group
[Output]
public ITaskItem [] TemplatesComponents { get; set; }
private const int _patchVersionResetOffset = 1;
private const int PatchVersionResetOffset = 1;
public override bool Execute()
{
@ -112,15 +110,10 @@ namespace Microsoft.DotNet.Cli.Build
// more in the above bug's detail.
// There is no non-deterministic existing ComponentId under Major version 5.
// so only apply the patch bump when below 5
int basePatch =
aspNetCoreTemplate.Major < 5
? aspNetCoreTemplate.Patch + _patchVersionResetOffset
: aspNetCoreTemplate.Patch;
var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor,
basePatch);
return baseMajorMinorPatch;
int basePatch = aspNetCoreTemplate.Major < 5 ?
aspNetCoreTemplate.Patch + PatchVersionResetOffset :
aspNetCoreTemplate.Patch;
return new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor, basePatch);
}
}

12
src/core-sdk-tasks/EnvironmentVariableFilter.cs
View file

@ -9,15 +9,15 @@ namespace Microsoft.DotNet.Cli.Build
{
public class EnvironmentFilter
{
private const string _MSBuildEnvironmentVariablePrefix = "MSBuild";
private const string _DotNetEnvironmentVariablePrefix = "DOTNET";
private const string _NugetEnvironmentVariablePrefix = "NUGET";
private const string MSBuildEnvironmentVariablePrefix = "MSBuild";
private const string DotNetEnvironmentVariablePrefix = "DOTNET";
private const string NugetEnvironmentVariablePrefix = "NUGET";
private IEnumerable<string> _prefixesOfEnvironmentVariablesToRemove = new string []
{
_MSBuildEnvironmentVariablePrefix,
_DotNetEnvironmentVariablePrefix,
_NugetEnvironmentVariablePrefix
MSBuildEnvironmentVariablePrefix,
DotNetEnvironmentVariablePrefix,
NugetEnvironmentVariablePrefix
};
private IEnumerable<string> _environmentVariablesToRemove = new string []

2
src/core-sdk-tasks/TarGzFileCreateFromDirectory.cs
View file

@ -102,9 +102,7 @@ namespace Microsoft.DotNet.Build.Tasks
if (IncludeBaseDirectory)
{
var parentDirectory = Directory.GetParent(SourceDirectory).Parent.FullName;
var sourceDirectoryName = Path.GetFileName(Path.GetDirectoryName(SourceDirectory));
return $"--directory {parentDirectory} {sourceDirectoryName} {GetExcludes()}";
}
else