Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pipelines/store/PDPs/PDP/fr/PDP.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ PowerShell est open source. Voir https://github.com/powershell/powershell</Desc
<!-- _locComment_text="{MaxLength=255} App DevStudio" -->
</DevStudio>
<ReleaseNotes _locID="App_ReleaseNotes">
<!-- _locComment_text="{MaxLength=1500} {Locked=___VERSION___}{Locked=___CHANGELOGLINK___} App Release Note" -->Version: ___VERSION___
<!-- _locComment_text="{MaxLength=1500} {Locked=___VERSION___}{Locked=___CHANGELOGLINK___} App Release Note" -->Version : ___VERSION___

Changelog: ___CHANGELOGLINK___</ReleaseNotes>
Journal des modifications : ___CHANGELOGLINK___</ReleaseNotes>
<AppFeatures>
<!-- Valid length: 200 character limit, up to 20 elements -->
<AppFeature _locID="App_feature1">
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/store/PDPs/PDP/ko/PDP.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ PowerShell이 오픈 소스로 제공됨. See https://github.com/powershell/pow
<!-- _locComment_text="{MaxLength=255} App DevStudio" -->
</DevStudio>
<ReleaseNotes _locID="App_ReleaseNotes">
<!-- _locComment_text="{MaxLength=1500} {Locked=___VERSION___}{Locked=___CHANGELOGLINK___} App Release Note" -->Version: ___VERSION___
<!-- _locComment_text="{MaxLength=1500} {Locked=___VERSION___}{Locked=___CHANGELOGLINK___} App Release Note" -->버전: ___VERSION___

Changelog: ___CHANGELOGLINK___</ReleaseNotes>
변경 로그: ___CHANGELOGLINK___</ReleaseNotes>
<AppFeatures>
<!-- Valid length: 200 character limit, up to 20 elements -->
<AppFeature _locID="App_feature1">
Expand Down
71 changes: 18 additions & 53 deletions build.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -2778,65 +2778,30 @@ function Install-Dotnet {
Remove-Item -ErrorAction SilentlyContinue -Recurse -Force ~\AppData\Local\Microsoft\dotnet
$installScript = "dotnet-install.ps1"
Invoke-WebRequest -Uri $installObtainUrl/$installScript -OutFile $installScript
if (-not $environment.IsCoreCLR) {
$installArgs = @{}
if ($Version) {
$installArgs += @{ Version = $Version }
} elseif ($Channel) {
$installArgs += @{ Quality = $Quality }
$installArgs += @{ Channel = $Channel }
}

if ($InstallDir) {
$installArgs += @{ InstallDir = $InstallDir }
}

if ($AzureFeed) {
$installArgs += @{AzureFeed = $AzureFeed}
}

if ($FeedCredential) {
$installArgs += @{FeedCredential = $FeedCredential}
}

$installArgs += @{ SkipNonVersionedFiles = $true }

$installArgs | Out-String | Write-Verbose -Verbose
& ./$installScript @installArgs
$installArgs = @{}
if ($Version) {
$installArgs.Version = $Version
}
elseif ($Channel) {
$installArgs.Channel = $Channel
$installArgs.Quality = $Quality
}
else {
# dotnet-install.ps1 uses APIs that are not supported in .NET Core, so we run it with Windows PowerShell
$fullPSPath = Join-Path -Path $env:windir -ChildPath "System32\WindowsPowerShell\v1.0\powershell.exe"
$fullDotnetInstallPath = Join-Path -Path (Convert-Path -Path $PWD.Path) -ChildPath $installScript

if ($Version) {
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version)
}
elseif ($Channel) {
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Channel', $Channel, '-Quality', $Quality)
}

if ($InstallDir) {
$psArgs += @('-InstallDir', $InstallDir)
}

if ($AzureFeed) {
$psArgs += @('-AzureFeed', $AzureFeed)
}
if ($InstallDir) {
$installArgs.InstallDir = $InstallDir
}

if ($FeedCredential) {
$psArgs += @('-FeedCredential', $FeedCredential)
}
if ($AzureFeed) {
$installArgs.AzureFeed = $AzureFeed
}

$psArgs += @('-SkipNonVersionedFiles')
if ($FeedCredential) {
$installArgs.FeedCredential = $FeedCredential
}

# Removing the verbose message to not expose the secret
# $psArgs -join ' ' | Write-Verbose -Verbose
$installArgs.SkipNonVersionedFiles = $true

Start-NativeExecution {
& $fullPSPath @psArgs
}
}
& ./$installScript @installArgs
}
Write-LogGroupEnd -Title "Install .NET SDK $Version"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
</data>
<data name="Columns" xml:space="preserve">
<value>Columns</value>
<comment>{StrContains="Columns"}</comment>
</data>
<data name="ManagementListDateTimeColumnFormatString" xml:space="preserve">
<value>{0:G}</value>
Expand All @@ -141,8 +142,10 @@
</data>
<data name="NotSupportAddingToItems" xml:space="preserve">
<value>{0} does not support adding to the Items collection, use {1} instead.</value>
<comment>{StrContains="Items"}</comment>
</data>
<data name="ViewSetWithType" xml:space="preserve">
<value>If View is set to a {0}, it should have the type {1}.</value>
<comment>{StrContains="View"}</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -205,26 +205,34 @@
</data>
<data name="ZoomIn1Shortcut" xml:space="preserve">
<value>Ctrl+Add</value>
<comment>{StrContains="Ctrl+Add"}</comment>
</data>
<data name="ZoomIn2Shortcut" xml:space="preserve">
<value>Ctrl+Shift+Add</value>
<comment>{StrContains="Ctrl+Shift+Add"}</comment>
</data>
<data name="ZoomIn3Shortcut" xml:space="preserve">
<value>Ctrl+Plus</value>
<comment>{StrContains="Ctrl+Plus"}</comment>
</data>
<data name="ZoomIn4Shortcut" xml:space="preserve">
<value>Ctrl+Shift+Plus</value>
<comment>{StrContains="Ctrl+Shift+Plus"}</comment>
</data>
<data name="ZoomOut1Shortcut" xml:space="preserve">
<value>Ctrl+Subtract</value>
<comment>{StrContains="Ctrl+Subtract"}</comment>
</data>
<data name="ZoomOut2Shortcut" xml:space="preserve">
<value>Ctrl+Shift+Subtract</value>
<comment>{StrContains="Ctrl+Shift+Subtract"}</comment>
</data>
<data name="ZoomOut3Shortcut" xml:space="preserve">
<value>Ctrl+Minus</value>
<comment>{StrContains="Ctrl+Minus"}</comment>
</data>
<data name="ZoomOut4Shortcut" xml:space="preserve">
<value>Ctrl+Shift+Minus</value>
<comment>{StrContains="Ctrl+Shift+Minus"}</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -2157,6 +2157,7 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Autom
.AddItemScriptBlock(@"""$($_.StrikethroughOff)$($_.StrikethroughOff.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "StrikethroughOff")
.AddItemScriptBlock(@"""$($_.Strikethrough)$($_.Strikethrough.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "Strikethrough")
.AddItemProperty(@"OutputRendering")
.AddItemProperty(@"AutoSizeDefaultFormatting")
.AddItemScriptBlock(@"""$($_.Formatting.FormatAccent)$($_.Formatting.FormatAccent.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Formatting.FormatAccent")
.AddItemScriptBlock(@"""$($_.Formatting.ErrorAccent)$($_.Formatting.ErrorAccent.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Formatting.ErrorAccent")
.AddItemScriptBlock(@"""$($_.Formatting.Error)$($_.Formatting.Error.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Formatting.Error")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ private void InitializeGroupBy()

private void InitializeAutoSize()
{
// Only Table and Wide views support autosize.
if (this is not (TableViewGenerator or WideViewGenerator))
{
return;
}

// check the autosize flag first
if (parameters != null && parameters.autosize.HasValue)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,11 @@ public FileInfoFormatting()
/// </summary>
public OutputRendering OutputRendering { get; set; } = OutputRendering.Host;

/// <summary>
/// Gets or sets whether to force the default implicit formatting to use 'AutoSize'.
/// </summary>
public bool AutoSizeDefaultFormatting { get; set; }

/// <summary>
/// Gets value to turn off all attributes.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,20 @@ public FormatDefaultCommand()
{
this.implementation = new InnerFormatShapeCommand(FormatShape.Undefined);
}

/// <summary>
/// Hook up the AutoSize override, if requested, before handing off to the
/// implementation.
/// </summary>
protected override void BeginProcessing()
{
if (PSStyle.Instance.AutoSizeDefaultFormatting)
{
var parameters = new FormattingCommandLineParameters { autosize = true };
((InnerFormatShapeCommand)this.implementation).SetCommandLineParameters(parameters);
}

base.BeginProcessing();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,13 @@
<value>Impossible de traiter le chemin d’accès « {0} », car la cible représente un nom d’appareil réservé.</value>
</data>
<data name="DirectoryNamePathTraversal" xml:space="preserve">
<value>Cannot process the remote directory name '{0}' because it may result in path traversal.</value>
<value>Impossible de traiter le nom de répertoire distant «{0}», car cela peut entraîner une traversée de chemin d’accès.</value>
</data>
<data name="FileNamePathTraversal" xml:space="preserve">
<value>Cannot process the remote file name '{0}' because it may result in path traversal.</value>
<value>Impossible de traiter le nom de fichier distant «{0}», car cela peut entraîner une traversée de chemin d’accès.</value>
</data>
<data name="ADSPathTraversal" xml:space="preserve">
<value>Cannot process the remote Alternate Data Stream name '{0}' because it may result in path traversal.</value>
<value>Impossible de traiter le nom de flux de données alternatif distant « {0} » car cela pourrait entraîner un parcours de chemin d'accès (path traversal).</value>
</data>
<data name="EncodingNotUsed" xml:space="preserve">
<value>L’encodage n’est pas utilisé quand « -AsByteStream » est spécifié.</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,13 @@
<value>대상이 예약된 디바이스 이름을 나타내므로 경로 '{0}'을(를) 처리할 수 없습니다.</value>
</data>
<data name="DirectoryNamePathTraversal" xml:space="preserve">
<value>Cannot process the remote directory name '{0}' because it may result in path traversal.</value>
<value>경로 통과가 발생할 수 있으므로 원격 디렉터리 이름 '{0}'을(를) 처리할 수 없습니다.</value>
</data>
<data name="FileNamePathTraversal" xml:space="preserve">
<value>Cannot process the remote file name '{0}' because it may result in path traversal.</value>
<value>경로 통과가 발생할 수 있으므로 원격 파일 이름 '{0}'을(를) 처리할 수 없습니다.</value>
</data>
<data name="ADSPathTraversal" xml:space="preserve">
<value>Cannot process the remote Alternate Data Stream name '{0}' because it may result in path traversal.</value>
<value>경로 통과가 발생할 수 있으므로 원격 대체 데이터 스트림 이름 '{0}'을(를) 처리할 수 없습니다.</value>
</data>
<data name="EncodingNotUsed" xml:space="preserve">
<value>'-AsByteStream'이 지정되면 인코딩은 사용되지 않습니다.</value>
Expand Down
Loading
Loading