Skip to content

Commit fcb19a5

Browse files
committed
fix
1 parent d21fe1e commit fcb19a5

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

.github/workflows/.config/docfx/build/docfx_local.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
]
2929
}
3030
],
31-
"output": "C:/dev/github.com/eigenverft/Eigenverft.Distributed.Drydock/output/docs/Eigenverft.Distributed.Drydock/Eigenverft.Distributed.Drydock/development/0.1.20256.27120/docfx",
31+
"output": "C:/dev/github.com/eigenverft/Eigenverft.Distributed.Drydock/output/docs/Eigenverft.Distributed.Drydock/Eigenverft.Distributed.Drydock/development/0.1.20256.27154/docfx",
3232
"template": [
3333
"statictoc",
3434
"../_exported_templates/override"

.github/workflows/cicd.ps1

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,11 @@ $DocFxConfigFileInfos = Find-FilesByPattern -Path (Get-Path -Paths @("$ConfigRoo
105105

106106
# Enable github specific nuget sources.
107107
$GitHubPackagesUser = "eigenverft"
108-
$GitHubSourceName = "githubeigenverft"
108+
$GitHubSourceName = "github"
109109
$GitHubSourceUri = "https://nuget.pkg.github.com/$GitHubPackagesUser/index.json"
110+
$NuGetTestSourceUri = "https://apiint.nugettest.org/v3/index.json"
111+
$NuGetOrgSourceUri = "https://api.nuget.org/v3/index.json"
112+
Unregister-LocalNuGetDotNetPackageSource -SourceName "$GitHubSourceName"
110113
Invoke-Exec -Executable "dotnet" -Arguments @("nuget","add", "source", "--username", "$GitHubPackagesUser","--password","$NUGET_GITHUB_PUSH","--store-password-in-clear-text","--name","$GitHubSourceName","$GitHubSourceUri") -CaptureOutput $false -CaptureOutputDump $false -HideValues @($NUGET_GITHUB_PUSH)
111114

112115
# Enable the .NET tools specified in the manifest file
@@ -135,7 +138,7 @@ $SolutionFileInfos = Find-FilesByPattern -Path "$GitRepositoryRoot\source" -Patt
135138
$SolutionProjectPaths = @()
136139
foreach ($solutionFile in $SolutionFileInfos) {
137140
# all ready sorted by the bbdist
138-
$CurrentProjectPaths = Invoke-Exec -Executable "bbdist" -Arguments @( "sln", "--file", "$($solutionFile.FullName)") -ReturnType 'Strings'
141+
$CurrentProjectPaths = Invoke-ProcessTyped -Executable "drydock.exe" -Arguments @( "sln", "--location", "$($solutionFile.FullName)") -ReturnType 'Objects'
139142
$SolutionProjectPaths += [pscustomobject]@{ Sln =$solutionFile; Prj = ($CurrentProjectPaths | ForEach-Object { Get-Item $_ }) };
140143
}
141144

@@ -339,11 +342,7 @@ foreach ($SolutionProjectPaths in $SolutionProjectPaths) {
339342

340343
# Resolving deployment information for the current branch
341344
$DeploymentChannel = $BranchDeploymentConfig.Channel.Value
342-
$GitHubPackagesUser = "eigenverft"
343-
$GitHubSourceName = "github"
344-
$GitHubSourceUri = "https://nuget.pkg.github.com/$GitHubPackagesUser/index.json"
345-
$NuGetTestSourceUri = "https://apiint.nugettest.org/v3/index.json"
346-
$NuGetOrgSourceUri = "https://api.nuget.org/v3/index.json"
345+
347346

348347
$BinaryDropRootPath = "C:\temp\$GitRepositoryName-drops"
349348

0 commit comments

Comments
 (0)