Skip to content

Commit 0adcda4

Browse files
[main] Source code updates from nuget/nuget.client (#8995)
[main] Source code updates from nuget/nuget.client
1 parent eff8f3a commit 0adcda4

73 files changed

Lines changed: 436 additions & 419 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/nuget-client/build/config.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
<!-- Version -->
1212
<PropertyGroup>
1313
<!-- ** Change for each new version -->
14-
<!-- when changing any of the NuGetVersion props below, run tools-local\ship-public-apis -->
1514
<MajorNuGetVersion Condition="'$(MajorNuGetVersion)' == ''">7</MajorNuGetVersion>
16-
<MinorNuGetVersion Condition="'$(MinorNuGetVersion)' == ''">11</MinorNuGetVersion>
15+
<MinorNuGetVersion Condition="'$(MinorNuGetVersion)' == ''">12</MinorNuGetVersion>
1716
<PatchNuGetVersion Condition="'$(PatchNuGetVersion)' == ''">0</PatchNuGetVersion>
1817
<SemanticVersion Condition=" '$(SemanticVersion)' == '' ">$(MajorNuGetVersion).$(MinorNuGetVersion).$(PatchNuGetVersion)</SemanticVersion>
1918

‎src/nuget-client/eng/pipelines/vs-test/apex.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ parameters:
1313
type: object
1414
- name: testExecutionJobTimeoutInMinutes
1515
type: number
16+
- name: testMachineTotalCount
17+
type: string
18+
default: '1'
19+
- name: testCaseDistributionBatchingStrategy
20+
type: string
21+
default: OptimizeDurationForBalance
1622
- name: testDeploymentCleanupMode
1723
type: string
1824
default: OnSuccess
@@ -33,6 +39,8 @@ stages:
3339
- ${{parameters.variables}}
3440
owner: nugetclienteng
3541
testMachineLab: "NuGet"
42+
testMachineTotalCount: ${{parameters.testMachineTotalCount}}
43+
testCaseDistributionBatchingStrategy: ${{parameters.testCaseDistributionBatchingStrategy}}
3644
runSettingsURI: ${{parameters.runSettingsURI}}
3745
visualStudioBootstrapperURI: ${{parameters.bootstrapperUrl}}
3846
visualStudioSigning: Test

‎src/nuget-client/eng/pipelines/vs-test/end_to_end.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
parameters:
2-
- name: part
3-
type: string
42
- name: stageName
53
type: string
64
- name: stageDisplayName
@@ -44,8 +42,6 @@ stages:
4442
value: ${{parameters.bootstrapperUrl}}
4543
- name: runSettingsURI
4644
value: ${{parameters.runSettingsURI}}
47-
- name: Part
48-
value: ${{parameters.part}}
4945
- ${{if gt(length(parameters.variables), 0)}}:
5046
- ${{parameters.variables}}
5147
visualStudioBootstrapperURI: $(bootstrapperUrl)
@@ -76,8 +72,8 @@ stages:
7672
inputs:
7773
scriptType: "inlineScript"
7874
inlineScript: |
79-
$EndToEndTestCommandToRunPart = '"' + "Run-Test -Exclude '${env:PART}' -Verbose *>&1 | Tee-Object $(System.DefaultWorkingDirectory)\artifacts\EndToEnd\FullLog_$(Build.BuildNumber).txt" +'"'
80-
Write-Host "##vso[task.setvariable variable=EndToEndTestCommandToRunPart]$EndToEndTestCommandToRunPart"
75+
$endToEndTestCommand = '"' + "Run-Test -Verbose *>&1 | Tee-Object $(System.DefaultWorkingDirectory)\artifacts\EndToEnd\FullLog_$(Build.BuildNumber).txt" + '"'
76+
Write-Host "##vso[task.setvariable variable=EndToEndTestCommandToRunPart]$endToEndTestCommand"
8177
8278
- task: PowerShell@1
8379
displayName: "Print Environment Variables"

‎src/nuget-client/eng/pipelines/vs-tests.yml‎

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,8 @@ parameters:
2929
values:
3030
- Production
3131
- Staging
32-
- name: E2EPart1AgentCleanup
33-
displayName: Delete or keep E2E Part 1 machine for debugging
34-
type: string
35-
default: delete
36-
values:
37-
- delete
38-
- stop
39-
- name: E2EPart2AgentCleanup
40-
displayName: Delete or keep E2E Part 2 machine for debugging
32+
- name: E2EAgentCleanup
33+
displayName: Delete or keep E2E machine for debugging
4134
type: string
4235
default: delete
4336
values:
@@ -88,31 +81,10 @@ stages:
8881
parameters:
8982
enableApexBlameHangDumpCollector: ${{parameters.EnableApexBlameHangDumpCollector}}
9083

91-
# Dartlab's template defines this in its own stage
92-
- template: vs-test/end_to_end.yml
93-
parameters:
94-
stageName: VS_EndToEnd_Part1
95-
stageDisplayName: Part 1
96-
condition: "and(succeeded(), ne(variables['RunEndToEndTests'], 'false'))"
97-
dependsOn:
98-
- Build
99-
variables:
100-
- name: VsBootstrapperUrl
101-
value: $[stageDependencies.Build.Build.outputs['dartlab_variables.bootstrapperUrl']]
102-
- name: RunSettingsDrop
103-
value: $[stageDependencies.Build.Build.outputs['dartlab_variables.RunSettingsDrop']]
104-
bootstrapperUrl: $(VsBootstrapperUrl)
105-
DartLabEnvironment: ${{parameters.DartLabEnvironment}}
106-
part: "InstallPackageTest.ps1,UninstallPackageTest.ps1,UpdatePackageTest.ps1"
107-
runSettingsURI: https://vsdrop.corp.microsoft.com/file/v1/$(RunSettingsDrop);NuGet.Tests.Apex.runsettings
108-
testExecutionJobTimeoutInMinutes: 100
109-
testMachineCleanUpStrategy: ${{parameters.E2EPart1AgentCleanup}}
110-
111-
# Dartlab's template defines this in its own stage
11284
- template: vs-test/end_to_end.yml
11385
parameters:
114-
stageName: VS_EndToEnd_Part2
115-
stageDisplayName: Part 2
86+
stageName: VS_EndToEnd
87+
stageDisplayName: On Windows
11688
condition: "and(succeeded(), ne(variables['RunEndToEndTests'], 'false'))"
11789
dependsOn:
11890
- Build
@@ -123,10 +95,9 @@ stages:
12395
value: $[stageDependencies.Build.Build.outputs['dartlab_variables.RunSettingsDrop']]
12496
bootstrapperUrl: $(VsBootstrapperUrl)
12597
DartLabEnvironment: ${{parameters.DartLabEnvironment}}
126-
part: "BuildIntegratedTest.ps1,ExecuteInitScriptTest.ps1,FindPackageTest.ps1,GetPackageTest.ps1,GetProjectTest.ps1,LegacyPackageRefProjectTest.ps1,NativeProjectTest.ps1,NetCoreProjectTest.ps1,PackTest.ps1,ProjectRetargeting.ps1,ServicesTest.ps1,Settings.ps1,SyncPackageTest.ps1,TabExpansionTest.ps1,UniversalWindowsProjectTest.ps1"
12798
runSettingsURI: https://vsdrop.corp.microsoft.com/file/v1/$(RunSettingsDrop);NuGet.Tests.Apex.runsettings
12899
testExecutionJobTimeoutInMinutes: 100
129-
testMachineCleanUpStrategy: ${{parameters.E2EPart2AgentCleanup}}
100+
testMachineCleanUpStrategy: ${{parameters.E2EAgentCleanup}}
130101

131102
# Dartlab's template defines this in its own stage
132103
- template: vs-test/apex.yml
@@ -144,5 +115,7 @@ stages:
144115
bootstrapperUrl: $(bootstrapperUrl)
145116
runSettingsURI: https://vsdrop.corp.microsoft.com/file/v1/$(RunSettingsDrop);NuGet.Tests.Apex.runsettings
146117
testExecutionJobTimeoutInMinutes: 412 # cloud test minimum
118+
testMachineTotalCount: '2'
119+
testCaseDistributionBatchingStrategy: OptimizeDurationForPerformance
147120
testDeploymentCleanupMode: ${{parameters.ApexAgentCleanup}}
148121
VsBootstrapperBranch: $(VsBootstrapperBranch)

‎src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/xlf/Resources.cs.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
</trans-unit>
460460
<trans-unit id="InfoBar_FixVulnerabilitiesWithCopilot">
461461
<source>Fix with GitHub Copilot</source>
462-
<target state="new">Fix with GitHub Copilot</target>
462+
<target state="translated">Opravit pomocí GitHub Copilota</target>
463463
<note>Do not translate GitHub or Copilot</note>
464464
</trans-unit>
465465
<trans-unit id="Label_Action">
@@ -589,7 +589,7 @@
589589
</trans-unit>
590590
<trans-unit id="Label_Installed_VulnerableWarning_Single">
591591
<source>You have 1 vulnerable package version installed.</source>
592-
<target state="new">You have 1 vulnerable package version installed.</target>
592+
<target state="translated">Máte nainstalovanou 1 zranitelnou verzi balíčku.</target>
593593
<note />
594594
</trans-unit>
595595
<trans-unit id="Label_License">

‎src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/xlf/Resources.de.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
</trans-unit>
460460
<trans-unit id="InfoBar_FixVulnerabilitiesWithCopilot">
461461
<source>Fix with GitHub Copilot</source>
462-
<target state="new">Fix with GitHub Copilot</target>
462+
<target state="translated">Mit GitHub Copilot beheben</target>
463463
<note>Do not translate GitHub or Copilot</note>
464464
</trans-unit>
465465
<trans-unit id="Label_Action">
@@ -589,7 +589,7 @@
589589
</trans-unit>
590590
<trans-unit id="Label_Installed_VulnerableWarning_Single">
591591
<source>You have 1 vulnerable package version installed.</source>
592-
<target state="new">You have 1 vulnerable package version installed.</target>
592+
<target state="translated">Es ist 1 anfällige Paketversion installiert.</target>
593593
<note />
594594
</trans-unit>
595595
<trans-unit id="Label_License">

‎src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/xlf/Resources.es.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
</trans-unit>
460460
<trans-unit id="InfoBar_FixVulnerabilitiesWithCopilot">
461461
<source>Fix with GitHub Copilot</source>
462-
<target state="new">Fix with GitHub Copilot</target>
462+
<target state="translated">Corrección con GitHub Copilot</target>
463463
<note>Do not translate GitHub or Copilot</note>
464464
</trans-unit>
465465
<trans-unit id="Label_Action">
@@ -589,7 +589,7 @@
589589
</trans-unit>
590590
<trans-unit id="Label_Installed_VulnerableWarning_Single">
591591
<source>You have 1 vulnerable package version installed.</source>
592-
<target state="new">You have 1 vulnerable package version installed.</target>
592+
<target state="translated">Tiene 1 versión de paquete vulnerable instalada.</target>
593593
<note />
594594
</trans-unit>
595595
<trans-unit id="Label_License">

‎src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/xlf/Resources.fr.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
</trans-unit>
460460
<trans-unit id="InfoBar_FixVulnerabilitiesWithCopilot">
461461
<source>Fix with GitHub Copilot</source>
462-
<target state="new">Fix with GitHub Copilot</target>
462+
<target state="translated">Corriger avec GitHub Copilot</target>
463463
<note>Do not translate GitHub or Copilot</note>
464464
</trans-unit>
465465
<trans-unit id="Label_Action">
@@ -589,7 +589,7 @@
589589
</trans-unit>
590590
<trans-unit id="Label_Installed_VulnerableWarning_Single">
591591
<source>You have 1 vulnerable package version installed.</source>
592-
<target state="new">You have 1 vulnerable package version installed.</target>
592+
<target state="translated">Vous avez 1 version de package vulnérable installé.</target>
593593
<note />
594594
</trans-unit>
595595
<trans-unit id="Label_License">

‎src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/xlf/Resources.it.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
</trans-unit>
460460
<trans-unit id="InfoBar_FixVulnerabilitiesWithCopilot">
461461
<source>Fix with GitHub Copilot</source>
462-
<target state="new">Fix with GitHub Copilot</target>
462+
<target state="translated">Correggi con GitHub Copilot</target>
463463
<note>Do not translate GitHub or Copilot</note>
464464
</trans-unit>
465465
<trans-unit id="Label_Action">
@@ -589,7 +589,7 @@
589589
</trans-unit>
590590
<trans-unit id="Label_Installed_VulnerableWarning_Single">
591591
<source>You have 1 vulnerable package version installed.</source>
592-
<target state="new">You have 1 vulnerable package version installed.</target>
592+
<target state="translated">È presente 1 versione del pacchetto vulnerabile.</target>
593593
<note />
594594
</trans-unit>
595595
<trans-unit id="Label_License">

‎src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/xlf/Resources.ja.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
</trans-unit>
460460
<trans-unit id="InfoBar_FixVulnerabilitiesWithCopilot">
461461
<source>Fix with GitHub Copilot</source>
462-
<target state="new">Fix with GitHub Copilot</target>
462+
<target state="translated">GitHub Copilot を使用して修正する</target>
463463
<note>Do not translate GitHub or Copilot</note>
464464
</trans-unit>
465465
<trans-unit id="Label_Action">
@@ -589,7 +589,7 @@
589589
</trans-unit>
590590
<trans-unit id="Label_Installed_VulnerableWarning_Single">
591591
<source>You have 1 vulnerable package version installed.</source>
592-
<target state="new">You have 1 vulnerable package version installed.</target>
592+
<target state="translated">脆弱性のあるパッケージが 1 個インストールされています。</target>
593593
<note />
594594
</trans-unit>
595595
<trans-unit id="Label_License">

0 commit comments

Comments
 (0)