diff --git a/.pipelines/ConsoleGuiTools-Official.yml b/.pipelines/ConsoleGuiTools-Official.yml
index 4f9edcf..f2861d4 100644
--- a/.pipelines/ConsoleGuiTools-Official.yml
+++ b/.pipelines/ConsoleGuiTools-Official.yml
@@ -8,7 +8,8 @@
# Support: https://aka.ms/onebranchsup #
#################################################################################
-trigger: none
+trigger:
+- main
schedules:
- cron: '50 19 * * 3'
@@ -76,10 +77,7 @@ extends:
inputs:
packageType: sdk
useGlobalJson: true
- - pwsh: |
- Register-PSRepository -Name CFS -SourceLocation "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v2" -InstallationPolicy Trusted
- Install-Module -Repository CFS -Name Microsoft.PowerShell.PSResourceGet
- ./tools/installPSResources.ps1 -PSRepository CFS
+ - pwsh: ./tools/installPSResources.ps1 -PSRepository CFS
displayName: Install PSResources
- pwsh: Invoke-Build -Configuration $(BuildConfiguration)
displayName: Build
@@ -119,7 +117,7 @@ extends:
files_to_sign: "*.nupkg"
- stage: release
dependsOn: build
- condition: ne(variables['Build.Reason'], 'Schedule')
+ condition: eq(variables['Build.Reason'], 'Manual')
variables:
version: $[ stageDependencies.build.main.outputs['package.version'] ]
drop: $(Pipeline.Workspace)/drop_build_main
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..1932808
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,5 @@
+
+
+ true
+
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000..be0590b
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/global.json b/global.json
index b6023e0..19e4d7e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "6.0.425",
+ "version": "8.0.405",
"rollForward": "latestFeature",
"allowPrerelease": false
}
diff --git a/src/Microsoft.PowerShell.ConsoleGuiTools/Microsoft.PowerShell.ConsoleGuiTools.csproj b/src/Microsoft.PowerShell.ConsoleGuiTools/Microsoft.PowerShell.ConsoleGuiTools.csproj
index da77cf2..ed25247 100644
--- a/src/Microsoft.PowerShell.ConsoleGuiTools/Microsoft.PowerShell.ConsoleGuiTools.csproj
+++ b/src/Microsoft.PowerShell.ConsoleGuiTools/Microsoft.PowerShell.ConsoleGuiTools.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net8.0
@@ -15,9 +15,9 @@
-
-
-
+
+
+
diff --git a/src/Microsoft.PowerShell.OutGridView.Models/Microsoft.PowerShell.OutGridView.Models.csproj b/src/Microsoft.PowerShell.OutGridView.Models/Microsoft.PowerShell.OutGridView.Models.csproj
index a77f3c0..a4f10f5 100644
--- a/src/Microsoft.PowerShell.OutGridView.Models/Microsoft.PowerShell.OutGridView.Models.csproj
+++ b/src/Microsoft.PowerShell.OutGridView.Models/Microsoft.PowerShell.OutGridView.Models.csproj
@@ -1,9 +1,9 @@
- net6.0
+ net8.0
-
+
diff --git a/tools/installPSResources.ps1 b/tools/installPSResources.ps1
index e98910d..3bb642a 100644
--- a/tools/installPSResources.ps1
+++ b/tools/installPSResources.ps1
@@ -6,8 +6,19 @@ param(
)
if ($PSRepository -eq "CFS" -and -not (Get-PSResourceRepository -Name CFS -ErrorAction SilentlyContinue)) {
- Register-PSResourceRepository -Name CFS -Uri "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json"
+ Register-PSResourceRepository -Name CFS -Uri "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShellGalleryMirror/nuget/v3/index.json"
}
-Install-PSResource -Repository $PSRepository -TrustRepository -Name InvokeBuild
-Install-PSResource -Repository $PSRepository -TrustRepository -Name platyPS
+# NOTE: Due to a bug in Install-PSResource with upstream feeds, we have to
+# request an exact version. Otherwise, if a newer version is available in the
+# upstream feed, it will fail to install any version at all.
+Install-PSResource -Verbose -TrustRepository -RequiredResource @{
+ InvokeBuild = @{
+ version = "5.12.1"
+ repository = $PSRepository
+ }
+ platyPS = @{
+ version = "0.14.2"
+ repository = $PSRepository
+ }
+}