Skip to content

Commit 1fa323c

Browse files
committed
Merge remote-tracking branch 'remotes/origin/dev' into fix-nuget-package-file-name
2 parents 6af6b22 + 7c59687 commit 1fa323c

269 files changed

Lines changed: 6989 additions & 2778 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.

.gdn/.gdnsuppress

Lines changed: 0 additions & 35 deletions
This file was deleted.

Directory.Packages.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,13 @@
5858
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
5959
<PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="17.10.40173" />
6060
<PackageVersion Include="Microsoft.NET.StringTools" Version="$(MicrosoftBuildVersion)" />
61-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
61+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
6262
<PackageVersion Include="Microsoft.PowerShell.3.ReferenceAssemblies" Version="1.0.0" />
6363
<!-- Microsoft.TeamFoundationServer.ExtendedClient has vulnerable dependencies Microsoft.IdentityModel.JsonWebTokens and System.IdentityModel.Tokens.Jwt . When it's upgraded, try removing the pinned packages -->
6464
<PackageVersion Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="16.153.0" />
6565
<PackageVersion Include="Microsoft.Test.Apex.VisualStudio" Version="18.0.0-preview-1-10723-180" />
6666
<PackageVersion Include="Microsoft.TestPlatform.Portable" Version="17.1.0" />
67+
<PackageVersion Include="Microsoft.VisualStudio.Copilot" Version="18.0.848-alpha" />
6768
<PackageVersion Include="Microsoft.VisualStudio.LanguageServices" Version="4.3.1" />
6869
<PackageVersion Include="Microsoft.VisualStudio.Markdown.Platform" Version="17.14.76-preview" />
6970
<PackageVersion Include="Microsoft.VisualStudio.ProjectSystem" Version="17.4.221-pre" />
@@ -104,7 +105,7 @@
104105
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
105106
<PackageVersion Include="VsWebSite.Interop" Version="17.10.40173" />
106107
<PackageVersion Include="xunit" Version="2.9.0" />
107-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
108+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
108109
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
109110
</ItemGroup>
110111

NuGet.Config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<package pattern="Azure.Core " />
2121
<package pattern="ben.demystifier" />
2222
<package pattern="castle.core" />
23+
<package pattern="Google.Protobuf" />
2324
<package pattern="Humanizer.Core" />
2425
<package pattern="ilrepack" />
2526
<package pattern="lucene.net" />
@@ -73,7 +74,7 @@
7374
<package pattern="microsoft.test.apex.visualstudio" />
7475
<package pattern="Microsoft.VisualStudio.*" />
7576
<package pattern="Microsoft.VisualStudioEng.MicroBuild.Core" />
76-
<package pattern="Microsoft.VSSDK.BuildTools" />
77+
<package pattern="Microsoft.VSSDK.*" />
7778
<package pattern="stdole" />
7879
<package pattern="streamjsonrpc" />
7980
<package pattern="vslangproj" />

build/DotNetSdkTestVersions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# To make sure that the right version of dotnet.exe (and maybe other files) is used, always install from lowest version to highest version
33
-Channel 8.0 -Runtime dotnet
44
-Channel 9.0 -Runtime dotnet
5-
-Channel 10.0.2xx -Version 10.0.200-preview.0.25609.107
5+
-Channel 10.0.3xx -Quality daily

build/DotNetSdkVersions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Each line represents arguments for the .NET SDK installer script (https://learn.microsoft.com/dotnet/core/tools/dotnet-install-script)
2-
-Channel 9.0.3xx
2+
-Channel 10.0.1xx

build/common.project.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<NetStandardVersion>netstandard2.0</NetStandardVersion>
1414
<NETCoreTargetFramework>net8.0</NETCoreTargetFramework>
1515
<NETCoreTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' == 'true'">net10.0</NETCoreTargetFramework>
16-
<LatestNETCoreTargetFramework>net9.0</LatestNETCoreTargetFramework>
16+
<LatestNETCoreTargetFramework>net10.0</LatestNETCoreTargetFramework>
1717
<LatestNETCoreTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' == 'true'">net10.0</LatestNETCoreTargetFramework>
1818

1919
<!-- Target frameworks for class libraries-->
@@ -88,7 +88,7 @@
8888
<Features>strict</Features>
8989
<!-- Same as SDK default, but without CandidateAssemblyFiles in front, which would search in Content items -->
9090
<AssemblySearchPaths>{HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</AssemblySearchPaths>
91-
<LangVersion>12</LangVersion>
91+
<LangVersion>14</LangVersion>
9292
<LangVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">latest</LangVersion>
9393
</PropertyGroup>
9494

build/config.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
<!-- ** Change for each new version -->
1414
<!-- when changing any of the NuGetVersion props below, run tools-local\ship-public-apis -->
1515
<MajorNuGetVersion Condition="'$(MajorNuGetVersion)' == ''">7</MajorNuGetVersion>
16-
<MinorNuGetVersion Condition="'$(MinorNuGetVersion)' == ''">4</MinorNuGetVersion>
16+
<MinorNuGetVersion Condition="'$(MinorNuGetVersion)' == ''">5</MinorNuGetVersion>
1717
<PatchNuGetVersion Condition="'$(PatchNuGetVersion)' == ''">0</PatchNuGetVersion>
1818
<SemanticVersion Condition=" '$(SemanticVersion)' == '' ">$(MajorNuGetVersion).$(MinorNuGetVersion).$(PatchNuGetVersion)</SemanticVersion>
1919

2020
<!-- ** Change for each new preview/rc -->
2121
<!-- Check the VS schedule and manually enter a preview number here that makes sense. -->
2222
<!-- Preview 3 is typically the last "main branch" preview, so we start using rc at this time -->
23-
<ReleaseLabel Condition=" '$(ReleaseLabel)' == '' ">preview.1</ReleaseLabel>
23+
<ReleaseLabel Condition=" '$(ReleaseLabel)' == '' ">rc</ReleaseLabel>
2424

2525
<IsEscrowMode Condition="'$(IsEscrowMode)' == ''">false</IsEscrowMode>
2626

eng/pipelines/compliance.yml

Lines changed: 86 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -8,101 +8,96 @@ resources:
88
trigger:
99
branches:
1010
- dev
11+
repositories:
12+
- repository: MicroBuildTemplate
13+
type: git
14+
name: 1ESPipelineTemplates/MicroBuildTemplate
15+
ref: refs/tags/release
1116

12-
jobs:
13-
- job: Static_Analysis
14-
displayName: "Static Analysis"
15-
timeoutInMinutes: 180
16-
pool:
17-
name: VSEngSS-MicroBuild2022-1ES
18-
19-
steps:
20-
- task: CredScan@2
21-
inputs:
22-
toolMajorVersion: "V2"
17+
variables:
18+
- group: NuGet.Client Build Variables
2319

24-
- task: PoliCheck@1
25-
inputs:
26-
inputType: "Basic"
27-
targetType: "F"
28-
targetArgument: "$(Build.SourcesDirectory)"
29-
result: "PoliCheck.xml"
20+
extends:
21+
template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate
22+
parameters:
23+
sdl:
24+
sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
25+
binskim:
26+
enabled: true
27+
scanOutputDirectoryOnly: true
28+
policheck:
29+
enabled: true
30+
suppression:
31+
suppressionFile: $(Build.SourcesDirectory)\.gdn\.gdnsuppress
32+
tsa:
33+
enabled: true
34+
config:
35+
codebaseName: "NuGet.Client_Trusted_dev"
36+
instanceUrl: https://dev.azure.com/devdiv/
37+
projectName: DevDiv
38+
areaPath: "DevDiv\\NuGet\\NuGet Clients"
39+
notificationAliases: $(TsaNotificationAliases)
40+
pool:
41+
name: AzurePipelines-EO
42+
image: VSEngSS-MicroBuild2022-1ES
43+
os: windows
44+
stages:
45+
- stage: compliance
46+
displayName: "Run Compliance Tasks"
47+
jobs:
48+
- job: Static_Analysis
49+
displayName: "Static Analysis"
50+
timeoutInMinutes: 180
51+
pool:
52+
name: VSEngSS-MicroBuild2022-1ES
53+
templateContext:
54+
inputs:
55+
- input: pipelineArtifact
56+
pipeline: nugetclientofficial
57+
artifactName: symbols - NonRTM
58+
targetPath: $(Pipeline.Workspace)\symbols\NonRTM
3059

31-
- task: DownloadPipelineArtifact@2
32-
displayName: "Download symbols - NonRTM artifact"
33-
inputs:
34-
source: specific
35-
project: "devdiv"
36-
pipeline: NuGet.Client-Official
37-
artifact: "symbols - NonRTM"
38-
path: $(Pipeline.Workspace)\symbols\NonRTM
60+
steps:
61+
- pwsh: "Get-ChildItem Env: | Sort-Object Name | Format-Table -Wrap -AutoSize"
62+
displayName: 'Print Environment Variables'
3963

40-
## Run latest version of APIScan listed at https://www.1eswiki.com/wiki/APIScan_Build_Task
41-
- task: APIScan@2
42-
displayName: Run APIScan
43-
inputs:
44-
softwareFolder: $(Pipeline.Workspace)\symbols
45-
softwareName: "NuGet.Client"
46-
softwareVersionNum: "$(Build.BuildId)"
47-
isLargeApp: true
48-
toolVersion: "Latest"
49-
azureSubscription: 'VSEng-APIScanSC'
50-
env:
51-
AzureServicesAuthConnectionString: RunAs=App;AppId=d318cba7-db4d-4fb3-99e1-01879cb74e91;TenantId=72f988bf-86f1-41af-91ab-2d7cd011db47;ServiceConnectionId=93e24264-c5e6-4681-8175-ec8a41668480;
52-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
64+
- task: APIScan@2
65+
displayName: Run APIScan
66+
inputs:
67+
softwareFolder: $(Pipeline.Workspace)\symbols
68+
softwareName: "NuGet.Client"
69+
softwareVersionNum: "$(Resources.Pipeline.nugetclientofficial.RunName)"
70+
isLargeApp: false
71+
toolVersion: "Latest"
72+
azureSubscription: 'VSEng-APIScanSC'
73+
preserveLogsFolder: true
74+
env:
75+
AzureServicesAuthConnectionString: RunAs=App;AppId=d318cba7-db4d-4fb3-99e1-01879cb74e91;TenantId=72f988bf-86f1-41af-91ab-2d7cd011db47;ServiceConnectionId=93e24264-c5e6-4681-8175-ec8a41668480;
76+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
5377

54-
- task: SdtReport@1
55-
displayName: "Generate Analysis Report"
56-
inputs:
57-
CredScan: true
58-
PoliCheck: true
59-
APIScan: true
60-
ToolLogsNotFoundAction: "Standard"
78+
- pwsh: |
79+
$tsaOptionsPath = Join-Path $env:AGENT_TEMPDIRECTORY 'TSAOptions.json'
80+
Write-Host "TsaNotificationAliases: $env:TSA_NOTIFICATION_ALIASES"
81+
$notificationAliases = @($env:TSA_NOTIFICATION_ALIASES | ConvertFrom-Json)
82+
$tsaOptions = [ordered]@{
83+
tsaVersion = 'TsaV2'
84+
codebaseName = 'NuGet.Client_Trusted_dev'
85+
instanceUrl = 'https://dev.azure.com/devdiv/'
86+
projectName = 'DevDiv'
87+
areaPath = 'DevDiv\\NuGet\\NuGet Clients'
88+
notificationAliases = $notificationAliases
89+
}
6190
62-
- task: TSAUpload@1
63-
displayName: "Upload to TSA"
64-
inputs:
65-
tsaVersion: "TsaV2"
66-
codebase: "$(TsaCodebase)"
67-
tsaEnvironment: "PROD"
68-
codeBaseName: "$(TsaCodebaseName)"
69-
notificationAlias: "$(TsaNotificationEmail)"
70-
codeBaseAdmins: "$(TsaCodebaseAdmins)"
71-
instanceUrlForTsaV2: "$(TsaInstanceUrl)"
72-
projectNameDEVDIV: "$(TsaProjectName)"
73-
areaPath: "$(TsaBugAreaPath)"
74-
iterationPath: "$(TsaIterationPath)"
75-
uploadAPIScan: false
76-
uploadBinSkim: false
77-
uploadCredScan: true
78-
uploadFortifySCA: false
79-
uploadFxCop: false
80-
uploadModernCop: false
81-
uploadPoliCheck: true
82-
uploadPREfast: false
83-
uploadRoslyn: false
84-
uploadTSLint: false
85-
uploadAsync: true
91+
$json = $tsaOptions | ConvertTo-Json -Depth 5
92+
Write-Host $json
93+
Write-Host "Writing TSA options to $tsaOptionsPath"
94+
$json| Out-File -FilePath $tsaOptionsPath -Encoding utf8 -Force
95+
displayName: Write TSAOptions.json
96+
env:
97+
TSA_NOTIFICATION_ALIASES: $(TsaNotificationAliases)
8698
87-
- task: PublishSecurityAnalysisLogs@2
88-
displayName: "Publish CodeAnalysis Logs"
89-
inputs:
90-
ArtifactName: "CodeAnalysisLogs"
91-
ArtifactType: "Container"
92-
AllTools: false
93-
AntiMalware: false
94-
APIScan: true
95-
BinSkim: false
96-
CodesignValidation: false
97-
CredScan: true
98-
FortifySCA: false
99-
FxCop: false
100-
ModernCop: false
101-
MSRD: false
102-
PoliCheck: true
103-
RoslynAnalyzers: false
104-
SDLNativeRules: false
105-
Semmle: false
106-
TSLint: false
107-
WebScout: false
108-
ToolLogsNotFoundAction: "Standard"
99+
- task: TSAUpload@2
100+
displayName: TSA upload
101+
inputs:
102+
GdnPublishTsaOnboard: True
103+
GdnPublishTsaConfigFile: $(Agent.TempDirectory)\TSAOptions.json

eng/pipelines/official.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ extends:
3939
enabled: true
4040
credscan:
4141
enabled: false
42-
suppression:
43-
suppressionFile: $(Build.SourcesDirectory)\.gdn\.gdnsuppress
4442
pool:
4543
name: AzurePipelines-EO
4644
image: 1ESPT-Windows2022
@@ -53,7 +51,7 @@ extends:
5351
- template: /eng/pipelines/templates/pipeline.yml@self
5452
parameters:
5553
isOfficialBuild: true
56-
${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/dev'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) }}:
54+
${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/dev'), eq(variables['Build.SourceBranch'], format('refs/heads/{0}', variables['OneLocReleaseBranch']))) }}:
5755
RunOneLocBuild: true
5856
RunBuildForPublishing: ${{parameters.RunBuildForPublishing}}
5957
SigningType: ${{ parameters.SigningType }}

0 commit comments

Comments
 (0)