Skip to content

Commit cf101e3

Browse files
committed
Replace Spectre.Console submodule with PackageReference
1 parent 1b6f43d commit cf101e3

16 files changed

+4
-56
lines changed

.github/workflows/macos-latest.yml

-11
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v3
3434
with:
35-
submodules: recursive
3635
fetch-depth: 0
3736
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3837
uses: actions/cache@v3
@@ -45,13 +44,3 @@ jobs:
4544
run: ./build.cmd Test Pack
4645
env:
4746
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
- name: 'Publish: test-results'
49-
uses: actions/upload-artifact@v3
50-
with:
51-
name: test-results
52-
path: output/test-results
53-
- name: 'Publish: packages'
54-
uses: actions/upload-artifact@v3
55-
with:
56-
name: packages
57-
path: output/packages

.github/workflows/ubuntu-latest.yml

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v3
3434
with:
35-
submodules: recursive
3635
fetch-depth: 0
3736
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3837
uses: actions/cache@v3

.github/workflows/windows-latest.yml

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v3
3434
with:
35-
submodules: recursive
3635
fetch-depth: 0
3736
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3837
uses: actions/cache@v3

.gitmodules

-3
This file was deleted.

.space.kts

+1-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ job("continuous") {
2424

2525
container("mcr.microsoft.com/dotnet/sdk:6.0") {
2626
shellScript {
27-
content = """
28-
git submodule update --init --recursive
29-
./build.sh Test
30-
"""
27+
content = "./build.sh Test"
3128
}
3229
}
3330

appveyor.continuous.yml

-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ branches:
2626

2727
skip_tags: true
2828

29-
install:
30-
- git submodule update --init --recursive
31-
3229
build_script:
3330
- cmd: .\build.cmd Test Pack
3431
- sh: ./build.cmd Test Pack

appveyor.yml

-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ branches:
2424

2525
skip_tags: true
2626

27-
install:
28-
- git submodule update --init --recursive
29-
3027
build_script:
3128
- cmd: .\build.cmd Pack Test SignPackages Publish
3229
- sh: ./build.cmd Pack Test SignPackages Publish

azure-pipelines.yml

-12
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ stages:
3030
strategy:
3131
parallel: 2
3232
steps:
33-
- checkout: self
34-
submodules: true
3533
- task: Cache@2
3634
displayName: 'Cache: nuke-temp'
3735
inputs:
@@ -57,8 +55,6 @@ stages:
5755
displayName: '📦 Pack'
5856
dependsOn: [ ]
5957
steps:
60-
- checkout: self
61-
submodules: true
6258
- task: Cache@2
6359
displayName: 'Cache: nuke-temp'
6460
inputs:
@@ -92,8 +88,6 @@ stages:
9288
strategy:
9389
parallel: 2
9490
steps:
95-
- checkout: self
96-
submodules: true
9791
- task: Cache@2
9892
displayName: 'Cache: nuke-temp'
9993
inputs:
@@ -119,8 +113,6 @@ stages:
119113
displayName: '📦 Pack'
120114
dependsOn: [ ]
121115
steps:
122-
- checkout: self
123-
submodules: true
124116
- task: Cache@2
125117
displayName: 'Cache: nuke-temp'
126118
inputs:
@@ -154,8 +146,6 @@ stages:
154146
strategy:
155147
parallel: 2
156148
steps:
157-
- checkout: self
158-
submodules: true
159149
- task: Cache@2
160150
displayName: 'Cache: nuke-temp'
161151
inputs:
@@ -181,8 +171,6 @@ stages:
181171
displayName: '📦 Pack'
182172
dependsOn: [ ]
183173
steps:
184-
- checkout: self
185-
submodules: true
186174
- task: Cache@2
187175
displayName: 'Cache: nuke-temp'
188176
inputs:

build/Build.CI.AppVeyor.cs

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
[AppVeyor(
99
suffix: null,
1010
AppVeyorImage.VisualStudio2022,
11-
Submodules = true,
1211
BranchesOnly = new[] { MasterBranch, $"/{ReleaseBranchPrefix}\\/*/" },
1312
SkipTags = true,
1413
InvokedTargets = new[] { nameof(IPack.Pack), nameof(ITest.Test), nameof(ISignPackages.SignPackages), nameof(IPublish.Publish) },
@@ -31,7 +30,6 @@
3130
AppVeyorImage.VisualStudioLatest,
3231
AppVeyorImage.UbuntuLatest,
3332
AppVeyorImage.MacOsLatest,
34-
Submodules = true,
3533
BranchesExcept = new[] { MasterBranch, $"/{ReleaseBranchPrefix}\\/*/" },
3634
SkipTags = true,
3735
InvokedTargets = new[] { nameof(ITest.Test), nameof(IPack.Pack) },

build/Build.CI.AzurePipelines.cs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
AzurePipelinesImage.WindowsLatest,
1818
AzurePipelinesImage.MacOsLatest,
1919
PullRequestsDisabled = true,
20-
Submodules = true,
2120
InvokedTargets = new[] { nameof(ITest.Test), nameof(IPack.Pack) },
2221
NonEntryTargets = new[] { nameof(IRestore.Restore), nameof(DownloadLicenses), nameof(ICompile.Compile), nameof(InstallFonts), nameof(ReleaseImage) },
2322
ExcludedTargets = new[] { nameof(Clean), nameof(ISignPackages.SignPackages) },

build/Build.CI.GitHubActions.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
[GitHubActions(
99
"windows-latest",
1010
GitHubActionsImage.WindowsLatest,
11-
Submodules = GitHubActionsSubmodules.Recursive,
1211
FetchDepth = 0,
1312
OnPushBranchesIgnore = new[] { MasterBranch, $"{ReleaseBranchPrefix}/*" },
1413
OnPullRequestBranches = new[] { DevelopBranch },
@@ -19,18 +18,16 @@
1918
[GitHubActions(
2019
"macos-latest",
2120
GitHubActionsImage.MacOsLatest,
22-
Submodules = GitHubActionsSubmodules.Recursive,
2321
FetchDepth = 0,
2422
OnPushBranchesIgnore = new[] { MasterBranch, $"{ReleaseBranchPrefix}/*" },
2523
OnPullRequestBranches = new[] { DevelopBranch },
26-
PublishArtifacts = true,
24+
PublishArtifacts = false,
2725
InvokedTargets = new[] { nameof(ITest.Test), nameof(IPack.Pack) },
2826
CacheKeyFiles = new[] { "global.json", "source/**/*.csproj" },
2927
EnableGitHubToken = true)]
3028
[GitHubActions(
3129
"ubuntu-latest",
3230
GitHubActionsImage.UbuntuLatest,
33-
Submodules = GitHubActionsSubmodules.Recursive,
3431
FetchDepth = 0,
3532
OnPushBranchesIgnore = new[] { MasterBranch, $"{ReleaseBranchPrefix}/*" },
3633
OnPullRequestBranches = new[] { DevelopBranch },

build/Build.CI.SpaceAutomation.cs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
[SpaceAutomation(
99
name: "continuous",
1010
image: "mcr.microsoft.com/dotnet/sdk:6.0",
11-
Submodules = true,
1211
OnPush = true,
1312
InvokedTargets = new[] { nameof(ITest.Test) })]
1413
partial class Build

external/spectre.console

-1
This file was deleted.

nuke-common.sln

-6
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuke.SourceGenerators", "so
3333
EndProject
3434
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuke.SourceGenerators.Tests", "source\Nuke.SourceGenerators.Tests\Nuke.SourceGenerators.Tests.csproj", "{82D47ABA-67B8-423D-97A7-979858FAAD43}"
3535
EndProject
36-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spectre.Console", "external\spectre.console\src\Spectre.Console\Spectre.Console.csproj", "{63651191-98F4-4AC0-8F45-D12F19431509}"
37-
EndProject
3836
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuke.Utilities", "source\Nuke.Utilities\Nuke.Utilities.csproj", "{2AC92E4F-F934-407A-A947-FA2C5FFF8CA7}"
3937
EndProject
4038
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuke.Utilities.Tests", "source\Nuke.Utilities.Tests\Nuke.Utilities.Tests.csproj", "{9B885587-0570-4FB7-9E1B-B315ED0E3194}"
@@ -111,10 +109,6 @@ Global
111109
{82D47ABA-67B8-423D-97A7-979858FAAD43}.Debug|Any CPU.Build.0 = Debug|Any CPU
112110
{82D47ABA-67B8-423D-97A7-979858FAAD43}.Release|Any CPU.ActiveCfg = Release|Any CPU
113111
{82D47ABA-67B8-423D-97A7-979858FAAD43}.Release|Any CPU.Build.0 = Release|Any CPU
114-
{63651191-98F4-4AC0-8F45-D12F19431509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115-
{63651191-98F4-4AC0-8F45-D12F19431509}.Debug|Any CPU.Build.0 = Debug|Any CPU
116-
{63651191-98F4-4AC0-8F45-D12F19431509}.Release|Any CPU.ActiveCfg = Release|Any CPU
117-
{63651191-98F4-4AC0-8F45-D12F19431509}.Release|Any CPU.Build.0 = Release|Any CPU
118112
{2AC92E4F-F934-407A-A947-FA2C5FFF8CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119113
{2AC92E4F-F934-407A-A947-FA2C5FFF8CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
120114
{2AC92E4F-F934-407A-A947-FA2C5FFF8CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU

source/Nuke.GlobalTool/Nuke.GlobalTool.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<ItemGroup>
1212
<ProjectReference Include="..\Nuke.Build\Nuke.Build.csproj" />
1313
<ProjectReference Include="..\Nuke.Common\Nuke.Common.csproj" />
14-
<ProjectReference Include="..\..\external\spectre.console\src\Spectre.Console\Spectre.Console.csproj" />
1514
</ItemGroup>
1615

1716
<ItemGroup>
17+
<PackageReference Include="matkoch.spectre.console" Version="0.46.0" />
1818
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
1919
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.2.0" />
2020
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.2.0" />

source/Nuke.SourceGenerators.Tests/StronglyTypedSolutionGeneratorTest.Test#StronglyTypedSolutionGenerator.verified.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ internal class Solution : Nuke.Common.ProjectModel.Solution
1414
public Project Nuke_Components => SolutionFolder.GetProject("Nuke.Components");
1515
public Project Nuke_SourceGenerators => SolutionFolder.GetProject("Nuke.SourceGenerators");
1616
public Project Nuke_SourceGenerators_Tests => SolutionFolder.GetProject("Nuke.SourceGenerators.Tests");
17-
public Project Spectre_Console => SolutionFolder.GetProject("Spectre.Console");
1817
public Project Nuke_Utilities => SolutionFolder.GetProject("Nuke.Utilities");
1918
public Project Nuke_Utilities_Tests => SolutionFolder.GetProject("Nuke.Utilities.Tests");
2019
public Project Nuke_Utilities_IO_Globbing => SolutionFolder.GetProject("Nuke.Utilities.IO.Globbing");
@@ -38,4 +37,4 @@ internal class _misc
3837

3938
public _misc(SolutionFolder solutionFolder) => SolutionFolder = solutionFolder;
4039
}
41-
}
40+
}

0 commit comments

Comments
 (0)