Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: dotnet azure pipeline (uv sync installation) #5042

Merged
merged 40 commits into from
Jan 16, 2025
Merged
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
3a80bc2
add code sign
bassmang Jan 14, 2025
9117000
install uv before build step
bassmang Jan 14, 2025
6e1e8e0
update astral to azure pipeline install
bassmang Jan 14, 2025
72ccaa8
use powershell command for uv
bassmang Jan 14, 2025
b7d99d3
add uv to path and get version
bassmang Jan 14, 2025
4659542
Merge remote-tracking branch 'upstream/main' into dotnet-signed
bassmang Jan 14, 2025
6a5962f
use powershell task for uv
bassmang Jan 14, 2025
573d28d
add PATH to build task
bassmang Jan 14, 2025
ef2776f
windows path
bassmang Jan 14, 2025
5391321
separate conditional from path in env
bassmang Jan 14, 2025
1af5b93
add conditional for just version
bassmang Jan 14, 2025
cf99518
separate version suffix conditional out of env
bassmang Jan 14, 2025
c6ee501
add variables in build job
bassmang Jan 14, 2025
bf35d34
if else one line
bassmang Jan 14, 2025
826ac03
separate if else
bassmang Jan 14, 2025
e0b2182
rrevert to windows path
bassmang Jan 14, 2025
53df487
comment out nightly build publish
bassmang Jan 14, 2025
554f7cf
readd conditionals for nightly
bassmang Jan 14, 2025
59bf361
update to code sign version 5 for nuget
bassmang Jan 14, 2025
70103c1
codesign
bassmang Jan 14, 2025
6c944d5
add esrp client id
bassmang Jan 14, 2025
e3624de
use msi auth
bassmang Jan 14, 2025
817ca3c
only add dll
bassmang Jan 14, 2025
aba8677
remove esrp clientid
bassmang Jan 14, 2025
2db093d
remove quotes esrpclientid
bassmang Jan 15, 2025
478bec6
change appregistration id
bassmang Jan 15, 2025
5dc7dae
Merge remote-tracking branch 'upstream/main' into dotnet-signed
bassmang Jan 15, 2025
87d7e34
update AppRegistrationClientId
bassmang Jan 15, 2025
53391a7
revert auth
bassmang Jan 15, 2025
bdd6a4f
Merge remote-tracking branch 'upstream/main' into dotnet-signed
bassmang Jan 15, 2025
6c5aef1
use 5.1 format
bassmang Jan 15, 2025
56dde4c
only use AuthSignCertName
bassmang Jan 15, 2025
bd5fee7
update 5.1 dlls
bassmang Jan 15, 2025
c01a568
try v5 standard
bassmang Jan 15, 2025
1618f9d
Merge remote-tracking branch 'upstream/main' into dotnet-signed
bassmang Jan 16, 2025
699cbbb
usemsi and esrpclient
bassmang Jan 16, 2025
1daacb2
comment out authcertname
bassmang Jan 16, 2025
a3aee87
new auth cert
bassmang Jan 16, 2025
444e99f
use msi and esrpclientid
bassmang Jan 16, 2025
f66cb0c
ensure all dlls in file path
bassmang Jan 16, 2025
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
59 changes: 41 additions & 18 deletions .azure/pipelines/templates/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,20 @@ jobs:
inputs:
useGlobalJson: true
workingDirectory: $(Build.SourcesDirectory)/dotnet
- task: PowerShell@2
displayName: 'Install uv'
inputs:
targetType: 'inline'
script: |
irm https://astral.sh/uv/install.ps1 | iex
$env:Path = "C:\Users\cloudtest\.local\bin;$env:Path"
uv --version
- task: Bash@3
displayName: Install .NET Aspire workload
inputs:
targetType: 'inline'
script: |
dotnet nuget locals all --clear
dotnet nuget locals all --clear
dotnet workload install aspire
- ${{ if eq(variables.runCodeQL3000, 'true') }}:
- task: CodeQL3000Init@0
Expand All @@ -106,6 +114,7 @@ jobs:
arguments: '$(build_flags) /bl:${{parameters.build_configuration}}-Build.binlog /p:Configuration=${{parameters.build_configuration}} $(solution)'
workingDirectory: $(Build.SourcesDirectory)/dotnet
env:
PATH: "C:\\Users\\cloudtest\\.local\\bin;$(PATH)"
${{ if and(eq(parameters.include_suffix, true), eq(parameters.publish_nuget, false)) }}:
VersionSuffix: ${{parameters.version_suffix}}
OfficialBuild: $(official_build)
Expand All @@ -125,16 +134,23 @@ jobs:
inputs:
SourceFolder: '$(build.sourcesdirectory)'
Contents: |
src/**/bin/${{parameters.build_configuration}}/**/AutoGen*.dll
src/**/bin/${{parameters.build_configuration}}/**/Microsoft.AutoGen.*.dll
**/AutoGen*.dll
**/Microsoft.AutoGen.*.dll
TargetFolder: '$(build.artifactstagingdirectory)\codesign'
CleanTargetFolder: true
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
displayName: 'Codesign: ESRP CodeSigning'
inputs:
ConnectedServiceName: 'CodeSign Service (NuGet)'
ConnectedServiceName: 'AI Frontiers ESRP'
AppRegistrationClientId: 'c1e7a5c0-ee6b-4cec-9e11-4dc3f4670042'
AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
#EsrpClientId: '7129dd35-ad94-49a9-98c7-eb4cf3cd36a9'
#UseMSIAuthentication: true
AuthAKVName: 'aif-autogen-esrp-kv'
AuthCertName: 'AIF-PME-InfrastructureAuth'
AuthSignCertName: 'AutoGenPublishESRPPKI' # this variable is only needed for codesign
FolderPath: '$(build.artifactstagingdirectory)\codesign'
Pattern: '*'
Pattern: '*.dll'
signConfigType: inlineSignParams
inlineOperation: |
[
Expand Down Expand Up @@ -163,15 +179,15 @@ jobs:
"parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
}
],
"toolName": "sign",
"toolVersion": "1.0"
},
{
"keyCode": "CP-230012",
"operationSetCode": "SigntoolVerify",
"parameters": [ ],
"toolName": "sign",
"toolVersion": "1.0"
"toolName": "sign",
"toolVersion": "1.0"
},
{
"keyCode": "CP-230012",
"operationSetCode": "SigntoolVerify",
"parameters": [ ],
"toolName": "sign",
"toolVersion": "1.0"
}
]
SessionTimeout: 180
Expand Down Expand Up @@ -200,10 +216,17 @@ jobs:
inputs:
packageType: runtime
version: $(codesign_runtime)
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
displayName: 'Codesign: ESRP CodeSigning (nuget)'
inputs:
ConnectedServiceName: 'CodeSign Service (NuGet)'
ConnectedServiceName: 'AI Frontiers ESRP'
AppRegistrationClientId: 'c1e7a5c0-ee6b-4cec-9e11-4dc3f4670042'
AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
EsrpClientId: '7129dd35-ad94-49a9-98c7-eb4cf3cd36a9'
UseMSIAuthentication: true
AuthAKVName: 'aif-autogen-esrp-kv'
#AuthCertName: 'AutoGenPublishESRPPKI'
AuthSignCertName: 'AutoGenPublishESRPPKI' # this variable is only needed for codesign
FolderPath: '$(build.sourcesdirectory)/Artifacts/${{parameters.build_configuration}}'
Pattern: '*.nupkg'
signConfigType: inlineSignParams
Expand All @@ -225,4 +248,4 @@ jobs:
}
]
SessionTimeout: 180
VerboseLogin: true
VerboseLogin: true
Loading