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.

Sign up for GitHub

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

Jump to bottom

Switch to AzDO feed #21531

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Switch to AzDO feed #21531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eac2426
Switch to AzDO feed
TravisEz13 Apr 24, 2024
525f60b
add restore only
TravisEz13 Apr 25, 2024
f00bd7a
Add auth to find missing notices
TravisEz13 Apr 25, 2024
cd81306
move the .net preview feed into our feed
TravisEz13 Apr 25, 2024
822bdf2
update cgmanifest
TravisEz13 Apr 25, 2024
a60e0a1
waste time
TravisEz13 Apr 25, 2024
d991ebe
Revert "waste time"
TravisEz13 Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion build.psm1
View file
Open in desktop
Expand Up @@ -288,6 +288,7 @@ function Start-PSBuild {
[switch]$Restore,
# Accept a path to the output directory
# When specified, --output <path> will be passed to dotnet
[switch]$RestoreOnly,
[string]$Output,
[switch]$ResGen,
[switch]$TypeGen,
Expand All @@ -298,6 +299,7 @@ function Start-PSBuild {
[switch]$NoPSModuleRestore,
[switch]$CI,
[switch]$ForMinimalSize,
[switch]$Interactive,

# Skips the step where the pwsh that's been built is used to create a configuration
# Useful when changing parsing/compilation, since bugs there can mean we can't get past this step
Expand Down Expand Up @@ -514,7 +516,11 @@ Fix steps:
}

# handle Restore
Restore-PSPackage -Options $Options -Force:$Restore -InteractiveAuth:$InteractiveAuth
Restore-PSPackage -Options $Options -Force:$($Restore -or $RestoreOnly) -InteractiveAuth:$InteractiveAuth
if ($RestoreOnly) {
return
}


# handle ResGen
# Heuristic to run ResGen on the fresh machine
Expand Down
3 changes: 1 addition & 2 deletions nuget.config
View file
Open in desktop
Expand Up @@ -2,8 +2,7 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v2" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="nuget.org" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell-dotnet-9/nuget/v3/index.json" />
Copy link
Collaborator

@tgauth tgauth May 2, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update WiX feed in build.psm1 - #21537

</packageSources>
<disabledPackageSources>
<clear />
Expand Down
10 changes: 5 additions & 5 deletions tools/cgmanifest.json
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Bcl.AsyncInterfaces",
"Version": "5.0.0"
"Version": "8.0.0"
}
},
"DevelopmentDependency": false
Expand Down Expand Up @@ -126,7 +126,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Extensions.ObjectPool",
"Version": "5.0.10"
"Version": "8.0.3"
}
},
"DevelopmentDependency": false
Expand Down Expand Up @@ -226,7 +226,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Windows.Compatibility",
"Version": "8.0.2"
"Version": "8.0.4"
}
},
"DevelopmentDependency": false
Expand Down Expand Up @@ -556,7 +556,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Diagnostics.DiagnosticSource",
"Version": "8.0.0"
"Version": "8.0.1"
}
},
"DevelopmentDependency": false
Expand Down Expand Up @@ -616,7 +616,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Drawing.Common",
"Version": "8.0.2"
"Version": "8.0.4"
}
},
"DevelopmentDependency": false
Expand Down
9 changes: 7 additions & 2 deletions tools/findMissingNotices.ps1
View file
Open in desktop
Expand Up @@ -7,7 +7,8 @@

param(
[switch] $Fix,
[switch] $IsStable
[switch] $IsStable,
[switch] $InteractiveAuth
)

Import-Module dotnet.project.assets
Expand Down Expand Up @@ -218,9 +219,13 @@ function Get-CGRegistrations {
Write-Verbose "Getting registrations for $folder - $actualRuntime ..." -Verbose
Get-PSDrive -Name $folder -ErrorAction Ignore | Remove-PSDrive
Push-Location $PSScriptRoot\..\src\$folder
$extraParams = @()
if ($InteractiveAuth) {
$extraParams += "--interactive"
}
try {
Start-NativeExecution -VerboseOutputOnError -sb {
dotnet restore --runtime $actualRuntime "/property:SDKToUse=$sdkToUse"
dotnet restore --runtime $actualRuntime "/property:SDKToUse=$sdkToUse" $extraParams
}
$null = New-PADrive -Path $PSScriptRoot\..\src\$folder\obj\project.assets.json -Name $folder
try {
Expand Down