Skip to content

Commit 9c6e81e

Browse files
HHobeckHHobeck
authored
Merge branch 'main' into refactor-next-version-calculator
2 parents 7535e34 + d64cfa1 commit 9c6e81e

File tree

231 files changed

+654
-843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+654
-843
lines changed

‎.github/workflows/ci.yml

Lines changed: 59 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,19 @@ jobs:
6363
name: '[Prepare]'
6464
if: steps.cache-cake.outputs.cache-hit != 'true'
6565
run: dotnet build build/CI.sln --configuration=Release
66+
-
67+
name: '[DogFood]'
68+
shell: pwsh
69+
run: dotnet run/build.dll --target=BuildPrepare
70+
-
71+
name: 'Upload gitversion tool'
72+
uses: actions/upload-artifact@v3
73+
with:
74+
name: tool
75+
path: ${{ github.workspace }}/dogfood
6676

6777
build:
68-
name: Build code & Package
78+
name: Build & Package
6979
needs: [prepare]
7080
runs-on: ${{ matrix.os }}
7181
strategy:
@@ -93,6 +103,12 @@ jobs:
93103
with:
94104
path: tools
95105
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
106+
-
107+
uses: actions/download-artifact@v3
108+
name: Download gitversion tool
109+
with:
110+
name: tool
111+
path: ${{ github.workspace }}/dogfood
96112
-
97113
name: Setup .NET SDK
98114
uses: actions/[email protected]
@@ -125,7 +141,7 @@ jobs:
125141
path: ${{ github.workspace }}/artifacts/packages/native/*.tar.gz
126142

127143
unit_test:
128-
name: Unit Test code
144+
name: Test
129145
needs: [prepare]
130146
runs-on: ${{ matrix.os }}
131147
env:
@@ -156,6 +172,12 @@ jobs:
156172
with:
157173
path: tools
158174
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
175+
-
176+
uses: actions/download-artifact@v3
177+
name: Download gitversion tool
178+
with:
179+
name: tool
180+
path: ${{ github.workspace }}/dogfood
159181
-
160182
name: Setup .NET SDK
161183
uses: actions/[email protected]
@@ -174,7 +196,7 @@ jobs:
174196
if: always()
175197

176198
artifacts_windows_test:
177-
name: Test artifacts on windows
199+
name: Artifacts
178200
needs: [build]
179201
runs-on: windows-latest
180202
strategy:
@@ -208,6 +230,12 @@ jobs:
208230
with:
209231
name: nuget
210232
path: ${{ github.workspace }}/artifacts/packages/nuget
233+
-
234+
uses: actions/download-artifact@v3
235+
name: Download gitversion tool
236+
with:
237+
name: tool
238+
path: ${{ github.workspace }}/dogfood
211239
-
212240
name: Setup .NET SDK
213241
uses: actions/[email protected]
@@ -219,13 +247,13 @@ jobs:
219247
run: dotnet run/artifacts.dll --target=Artifacts${{ matrix.package }}Test
220248

221249
artifacts_linux_test:
222-
name: Test artifacts in docker
250+
name: Artifacts
223251
needs: [build]
224252
runs-on: ubuntu-latest
225253
strategy:
226254
matrix:
227255
targetFramework: [ '7.0', '6.0' ]
228-
distro: [ alpine.3.13, alpine.3.14, centos.7, centos.8, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
256+
distro: [ alpine.3.15, alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.10, debian.11, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
229257
fail-fast: false
230258

231259
steps:
@@ -268,6 +296,12 @@ jobs:
268296
uses: docker/setup-buildx-action@v2
269297
with:
270298
install: true
299+
-
300+
uses: actions/download-artifact@v3
301+
name: Download gitversion tool
302+
with:
303+
name: tool
304+
path: ${{ github.workspace }}/dogfood
271305
-
272306
name: Setup .NET SDK
273307
uses: actions/[email protected]
@@ -283,13 +317,13 @@ jobs:
283317
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
284318

285319
docker_linux_images:
286-
name: Build, Test and Publish Docker Images
320+
name: Docker Images
287321
needs: [build]
288322
runs-on: ubuntu-latest
289323
strategy:
290324
matrix:
291325
targetFramework: [ '7.0', '6.0' ]
292-
distro: [ alpine.3.13, alpine.3.14, centos.7, centos.8, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
326+
distro: [ alpine.3.15, alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.10, debian.11, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
293327
fail-fast: false
294328

295329
steps:
@@ -326,6 +360,12 @@ jobs:
326360
uses: docker/setup-buildx-action@v2
327361
with:
328362
install: true
363+
-
364+
uses: actions/download-artifact@v3
365+
name: Download gitversion tool
366+
with:
367+
name: tool
368+
path: ${{ github.workspace }}/dogfood
329369
-
330370
name: Setup .NET SDK
331371
uses: actions/[email protected]
@@ -416,6 +456,12 @@ jobs:
416456
with:
417457
name: nuget
418458
path: ${{ github.workspace }}/artifacts/packages/nuget
459+
-
460+
uses: actions/download-artifact@v3
461+
name: Download gitversion tool
462+
with:
463+
name: tool
464+
path: ${{ github.workspace }}/dogfood
419465
-
420466
name: Setup .NET SDK
421467
uses: actions/[email protected]
@@ -470,6 +516,12 @@ jobs:
470516
with:
471517
name: native-macOS
472518
path: ${{ github.workspace }}/artifacts/packages/native
519+
-
520+
uses: actions/download-artifact@v3
521+
name: Download gitversion tool
522+
with:
523+
name: tool
524+
path: ${{ github.workspace }}/dogfood
473525
-
474526
name: Setup .NET SDK
475527
uses: actions/[email protected]

‎.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ on:
2222

2323
permissions:
2424
contents: read
25+
env:
26+
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
27+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
28+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
29+
DOTNET_NOLOGO: 1
2530

2631
jobs:
2732
analyze:
@@ -71,7 +76,7 @@ jobs:
7176
-
7277
name: '[Build]'
7378
shell: pwsh
74-
run: dotnet run/build.dll --target=Build --exclusive
79+
run: dotnet run/build.dll --target=BuildPrepare --exclusive
7580

7681
- name: Perform CodeQL Analysis
7782
uses: github/codeql-action/analyze@v2

‎.github/workflows/docs.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ on:
2626
- .github/workflows/docs.yml
2727
env:
2828
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
29+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
30+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
31+
DOTNET_NOLOGO: 1
2932

3033
jobs:
3134
prepare:
@@ -80,7 +83,16 @@ jobs:
8083
name: '[Prepare]'
8184
if: steps.cache-cake.outputs.cache-hit != 'true'
8285
run: dotnet build build/CI.sln --configuration=Release
83-
86+
-
87+
name: '[DogFood]'
88+
shell: pwsh
89+
run: dotnet run/build.dll --target=BuildPrepare
90+
-
91+
name: 'Upload gitversion tool'
92+
uses: actions/upload-artifact@v3
93+
with:
94+
name: tool
95+
path: ${{ github.workspace }}/dogfood
8496
validate:
8597
name: Validates Html
8698
needs: [prepare]
@@ -110,6 +122,12 @@ jobs:
110122
uses: actions/[email protected]
111123
with:
112124
dotnet-version: '7.0.x'
125+
-
126+
uses: actions/download-artifact@v3
127+
name: Download gitversion tool
128+
with:
129+
name: tool
130+
path: ${{ github.workspace }}/dogfood
113131
-
114132
name: '[Build Documentation]'
115133
shell: pwsh
@@ -165,6 +183,12 @@ jobs:
165183
uses: actions/[email protected]
166184
with:
167185
dotnet-version: '7.0.x'
186+
-
187+
uses: actions/download-artifact@v3
188+
name: Download gitversion tool
189+
with:
190+
name: tool
191+
path: ${{ github.workspace }}/dogfood
168192
-
169193
name: '[Publish Documentation]'
170194
if: ${{ github.event_name == 'push' }}

‎.github/workflows/format.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,23 @@ on:
2222
permissions:
2323
contents: read
2424

25+
env:
26+
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
27+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
28+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
29+
DOTNET_NOLOGO: 1
30+
2531
jobs:
2632
format:
27-
runs-on: ubuntu-latest
33+
runs-on: windows-latest
2834
name: DotNet Format
2935
steps:
3036
- uses: actions/checkout@v3
3137
-
3238
name: Setup .NET SDK
3339
uses: actions/[email protected]
3440
with:
35-
dotnet-version: '7.0.x'
41+
dotnet-version: '7.0.102'
3642
-
3743
name: Run Format Build solution
3844
run: dotnet format ./build/ --verify-no-changes

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,5 @@ docs/output
132132

133133
# NPM
134134
node_modules
135+
136+
dogfood/

‎build/.run/Artifacts DotnetTool Test.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

‎build/.run/Artifacts Executable Test.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

‎build/.run/Artifacts MsBuildCore Test.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

‎build/.run/Artifacts MsBuildFull Test.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

‎build/.run/Artifacts Native Test.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

‎build/.run/Artifacts Prepare.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

‎build/.run/Artifacts Test.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

‎build/.run/Build Docs.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>
1919
</configuration>
20-
</component>
20+
</component>

‎build/.run/Build Prepare.run.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Build Prepare" type="DotNetProject" factoryName=".NET Project">
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=BuildPrepare" />
5+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
6+
<option name="PASS_PARENT_ENVS" value="1" />
7+
<option name="USE_EXTERNAL_CONSOLE" value="0" />
8+
<option name="USE_MONO" value="0" />
9+
<option name="RUNTIME_ARGUMENTS" value="" />
10+
<option name="PROJECT_PATH" value="$PROJECT_DIR$/build/build.csproj" />
11+
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
12+
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
13+
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
14+
<option name="PROJECT_KIND" value="DotNetCore" />
15+
<option name="PROJECT_TFM" value="net7.0" />
16+
<method v="2">
17+
<option name="Build" />
18+
</method>
19+
</configuration>
20+
</component>

‎build/.run/Build.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

‎build/.run/Clean.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>

‎build/.run/Code Format.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
1414
<option name="PROJECT_KIND" value="DotNetCore" />
15-
<option name="PROJECT_TFM" value="net6.0" />
15+
<option name="PROJECT_TFM" value="net7.0" />
1616
<method v="2">
1717
<option name="Build" />
1818
</method>
1919
</configuration>
20-
</component>
20+
</component>

0 commit comments

Comments
 (0)