Skip to content

Set R1 Network Flag on Windows Container Image; Remove NuGetInstaller References #5210

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

Open
wants to merge 4 commits into
base: release/1.7-stable
Choose a base branch
from
Open
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
16 changes: 2 additions & 14 deletions BuildAll.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,6 @@ if ($Clean)
Exit
}

# Make sure nuget directory exists.
if(-not (test-path ".nuget"))
{
new-item -path ".nuget" -itemtype directory
}

# Make sure nuget is on the system
if(-not (test-path ".nuget\nuget.exe"))
{
Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile .nuget\nuget.exe
}

$configurationForMrtAndAnyCPU = "Release"
$MRTSourcesDirectory = "dev\MRTCore"

Expand All @@ -90,7 +78,7 @@ function NugetRestore([string] $Label, [string] $Target)
{
$env:NUGET_RESTORE_MSBUILD_ARGS = "/binaryLogger:BuildOutput\binlogs\$Label.restore.$Platform.$Configuration.binlog /p:Platform=$Platform /p:Configuration=$Configuration"
}
& .\.nuget\nuget.exe restore $Target -configfile NuGet.config
nuget restore $Target -configfile NuGet.config
if ($lastexitcode -ne 0)
{
write-host "ERROR: nuget.exe restore $Label FAILED."
Expand Down Expand Up @@ -383,7 +371,7 @@ Try {
Set-Content -Value $publicNuspec.OuterXml $nuspecPath

# Make the foundation transport package.
& .\.nuget\nuget.exe pack $nuspecPath -BasePath $BasePath -OutputDirectory $OutputDirectory
nuget pack $nuspecPath -BasePath $BasePath -OutputDirectory $OutputDirectory

if ($lastexitcode -ne 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ parameters:
default: true

steps:
- task: NuGetToolInstaller@1

- task: NuGetAuthenticate@1
inputs:
nuGetServiceConnections: 'TelemetryInternal'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ parameters:
default: true

steps:
- task: NuGetToolInstaller@1

- task: NuGetAuthenticate@1
inputs:
nuGetServiceConnections: 'TelemetryInternal'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ steps:
}
Exit 1

- task: NuGetToolInstaller@1

- task: NuGetAuthenticate@1

- task: VSBuild@1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ stages:
name: 'ProjectReunionESPool-2022' # This stage is purely for ES, hence this custom pool
timeoutInMinutes: 120
steps:
- task: NuGetToolInstaller@1
- task: NuGetAuthenticate@1

- task: powershell@2
Expand Down
6 changes: 2 additions & 4 deletions build/NuSpecs/build-nupkg.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.Window
# Build Windows App SDK package (with actual contents, i.e. not metapackage)
#

$nugetExe = "$scriptDirectory\..\..\tools\NugetWrapper.cmd"
$NugetCmdLine = "$nugetExe pack WindowsAppSDK.nuspec $NugetArgs -version $version"
$NugetCmdLine = "nuget pack WindowsAppSDK.nuspec $NugetArgs -version $version"
Write-Host 'Building Windows SDK package'
Write-Host $NugetCmdLine
Invoke-Expression $NugetCmdLine
Expand All @@ -137,8 +136,7 @@ Write-Host

ConfigureNugetCommandLine("Microsoft.WindowsAppSDK.MetaPackage")

$nugetExe = "$scriptDirectory\..\..\tools\NugetWrapper.cmd"
$NugetCmdLine = "$nugetExe pack WindowsAppSDKMetaPackage.nuspec $NugetArgs -version $version"
$NugetCmdLine = "nuget pack WindowsAppSDKMetaPackage.nuspec $NugetArgs -version $version"
Write-Host 'Building Windows App SDK Meta Package'
Write-Host $NugetCmdLine
Invoke-Expression $NugetCmdLine
Expand Down
6 changes: 0 additions & 6 deletions build/ProjectReunion-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ jobs:
- checkout: self
persistCredentials: true

- task: NuGetToolInstaller@1

- template: AzurePipelinesTemplates\WindowsAppSDK-SetupBuildEnvironment-Steps.yml
parameters:
IsOneBranch: false
Expand All @@ -111,8 +109,6 @@ jobs:
pool:
vmImage: 'windows-2022'
steps:
- task: NuGetToolInstaller@1

- template: AzurePipelinesTemplates\WindowsAppSDK-SetupBuildEnvironment-Steps.yml
parameters:
IsOneBranch: false
Expand Down Expand Up @@ -147,8 +143,6 @@ jobs:
variables:
ob_artifactBaseName: "MrtBinaries_$(buildConfiguration)_$(buildPlatform)" # For BuildMRT to publish t
steps:
- task: NuGetToolInstaller@1

- template: AzurePipelinesTemplates\WindowsAppSDK-BuildMRT-Steps.yml
parameters:
IsOneBranch: false
Expand Down
3 changes: 3 additions & 0 deletions build/WindowsAppSDK-BuildDevCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ extends:
parameters:
platform:
name: 'windows_undocked' # windows undocked
featureFlags:
WindowsHostVersion:
Network: R1

stages:
- stage: PackageDevCheck
Expand Down
5 changes: 4 additions & 1 deletion build/WindowsAppSDK-Foundation-Nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ extends:
template: v2/Microsoft.NonOfficial.yml@templates # https://aka.ms/obpipelines/templates
parameters:
featureFlags:
EnableCDPxPAT: false
EnableCDPxPAT: false
WindowsHostVersion:
Network: R1

platform:
name: 'windows_undocked' # windows undocked

Expand Down
5 changes: 4 additions & 1 deletion build/WindowsAppSDK-Foundation-Official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ extends:
template: v2/Microsoft.Official.yml@templates # https://aka.ms/obpipelines/templates
parameters:
featureFlags:
EnableCDPxPAT: false
EnableCDPxPAT: false
WindowsHostVersion:
Network: R1

platform:
name: 'windows_undocked' # windows undocked

Expand Down
5 changes: 4 additions & 1 deletion build/WindowsAppSDK-Foundation-PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ extends:
template: v2/Microsoft.NonOfficial.yml@templates # https://aka.ms/obpipelines/templates
parameters:
featureFlags:
EnableCDPxPAT: false
EnableCDPxPAT: false
WindowsHostVersion:
Network: R1

platform:
name: 'windows_undocked' # windows undocked

Expand Down
23 changes: 0 additions & 23 deletions tools/NugetWrapper.cmd

This file was deleted.