Skip to content

Commit 08dc0b9

Browse files
committed
minimum adjustments to get it working
1 parent fcb19a5 commit 08dc0b9

5 files changed

Lines changed: 13 additions & 12 deletions

File tree

.github/workflows/cicd.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ $CopyToZipDrop = $false
359359
if ($DeploymentChannel -in @("development"))
360360
{
361361
$PushToLocalSource = $true
362-
$PushToGitHubSource = $true
362+
$PushToGitHubSource = $false
363363
$PushToNuGetTest = $false
364364
$PushToNuGetOrg = $false
365365

source/Eigenverft.Distributed.Drydock/ProjectItems/Eigenverft.Distributed.Drydock/CommandDefinition/CsProjCommandAsync.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,20 @@ public async Task<int> CsProjCommandAsync(ParseResult parseResult, CancellationT
2222
{
2323
try
2424
{
25-
var sourceDirectory = parseResult.GetRequiredValue(CsProjCommand.Location);
26-
var outputArchive = parseResult.GetRequiredValue(CsProjCommand.Property);
27-
28-
var result = await _solutionProjectService.GetProjectProperty(sourceDirectory, outputArchive, CsProjCommand.ElementScope.inner, cancellationToken);
29-
25+
var location = parseResult.GetRequiredValue(CsProjCommand.Location);
3026
var propertyName = parseResult.GetRequiredValue(CsProjCommand.Property);
27+
var scope = parseResult.GetRequiredValue(CsProjCommand.Scope);
28+
29+
var result = await _solutionProjectService.GetProjectProperty(location, propertyName, scope, cancellationToken);
30+
3131
if (!string.IsNullOrEmpty(result))
3232
{
33-
_logger.LogInformation("Property '{Property}' from '{ProjectFile}' = {Value}", propertyName, sourceDirectory, result);
33+
Console.WriteLine(result);
34+
//_logger.LogInformation("Property '{Property}' from '{ProjectFile}' = {Value}", propertyName, location, result);
3435
}
3536
else
3637
{
37-
_logger.LogWarning("Property '{Property}' was not found or is empty in project: {ProjectFile}", propertyName, sourceDirectory);
38+
_logger.LogWarning("Property '{Property}' was not found or is empty in project: {ProjectFile}", propertyName, location);
3839
return -1;
3940
}
4041
}

source/Eigenverft.Distributed.Drydock/ProjectItems/Eigenverft.Distributed.Drydock/Eigenverft.Distributed.Drydock.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PropertyGroup>
1010
<OutputType>Exe</OutputType>
1111
<TargetFramework>net8.0</TargetFramework>
12-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
12+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
1313
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
1414
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1515
<InvariantGlobalization>true</InvariantGlobalization>

source/Eigenverft.Distributed.Drydock/ProjectItems/Eigenverft.Distributed.Drydock/Properties/launchSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"profiles": {
33
"Eigenverft.Distributed.Drydock": {
44
"commandName": "Project",
5-
"commandLineArgs": "sln --location C:\\dev\\github.com\\eigenverft\\Eigenverft.Distributed.Drydock\\source\\Eigenverft.Distributed.Drydock.sln"
5+
"commandLineArgs": "csproj --location C:\\dev\\github.com\\eigenverft\\Eigenverft.Distributed.Drydock\\source\\Eigenverft.Distributed.Drydock\\ProjectItems\\ClassLibrary1\\ClassLibrary1.csproj --property TargetFrameworks"
66
}
77
}
88
}

source/Eigenverft.Distributed.Drydock/ProjectItems/Eigenverft.Distributed.Drydock/Services/SolutionProjectService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,12 @@ public async Task<List<string>> GetCsProjAbsolutPathsFromSolutions(string soluti
170170
{
171171
if (scopeType.Value == CsProjCommand.ElementScope.inner)
172172
{
173-
_logger.LogDebug("Returning inner element value for property '{PropertyName}' from project: {ProjectLocation}", propertyName, projectLocation);
173+
// _logger.LogDebug("Returning inner element value for property '{PropertyName}' from project: {ProjectLocation}", propertyName, projectLocation);
174174
return property.Value;
175175
}
176176
else
177177
{
178-
_logger.LogDebug("Returning outer element value for property '{PropertyName}' from project: {ProjectLocation}", propertyName, projectLocation);
178+
// _logger.LogDebug("Returning outer element value for property '{PropertyName}' from project: {ProjectLocation}", propertyName, projectLocation);
179179
return property.OuterElement;
180180
}
181181
}

0 commit comments

Comments
 (0)