Skip to content

Commit 7644140

Browse files
arturcicarturcic
authored
Merge pull request #4497 from arturcic/feature/slnx
Migrate solution files to slnx format
2 parents 78b8c68 + 53b9d03 commit 7644140

13 files changed

+147
-409
lines changed

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Custom for Visual Studio
1212
*.cs diff=csharp
1313
*.sln
14+
*.slnx
1415
*.csproj
1516
*.vbproj
1617
*.fsproj

‎.github/workflows/_prepare.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
-
4747
name: '[Build]'
4848
if: steps.cache-cake.outputs.cache-hit != 'true'
49-
run: dotnet build build/CI.sln --configuration=Release
49+
run: dotnet build build/ --configuration=Release
5050
-
5151
name: '[Prepare]'
5252
shell: pwsh

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
-
7575
name: '[Prepare]'
7676
if: steps.cache-cake.outputs.cache-hit != 'true'
77-
run: dotnet build build/CI.sln --configuration=Release
77+
run: dotnet build build/ --configuration=Release
7878

7979
-
8080
name: '[Build]'

‎.github/workflows/docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
-
7979
name: '[Build]'
8080
if: steps.cache-cake.outputs.cache-hit != 'true'
81-
run: dotnet build build/CI.sln --configuration=Release
81+
run: dotnet build build/ --configuration=Release
8282
-
8383
name: '[Prepare]'
8484
shell: pwsh

‎.gitignore

-4
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,15 @@ Thumbs.db
8484
Desktop.ini
8585

8686
_NCrunch_GitVersion
87-
GitVersion.sln.ide/
8887
.vs/
8988
Packages/
90-
site/
9189
/TestResult.xml
9290

9391
################
9492
# Project Rider
9593
################
9694

9795
.idea
98-
*.sln.iml
99-
10096

10197
####################
10298
# Visual Studio Code

‎build/CI.sln

-143
This file was deleted.

‎build/CI.slnx

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<Solution>
2+
<Folder Name="/actions/" />
3+
<Folder Name="/actions/artifacts-attest/">
4+
<File Path="../.github/actions/artifacts-attest/action.yml" />
5+
</Folder>
6+
<Folder Name="/actions/artifacts-restore/">
7+
<File Path="../.github/actions/artifacts-restore/action.yml" />
8+
</Folder>
9+
<Folder Name="/actions/cache-restore/">
10+
<File Path="../.github/actions/cache-restore/action.yml" />
11+
</Folder>
12+
<Folder Name="/actions/docker-manifests/">
13+
<File Path="../.github/actions/docker-manifests/action.yml" />
14+
</Folder>
15+
<Folder Name="/actions/docker-publish/">
16+
<File Path="../.github/actions/docker-publish/action.yml" />
17+
</Folder>
18+
<Folder Name="/actions/docker-test/">
19+
<File Path="../.github/actions/docker-test/action.yml" />
20+
</Folder>
21+
<Folder Name="/scripts/">
22+
<File Path="../tests/scripts/test-global-tool.sh" />
23+
<File Path="../tests/scripts/test-msbuild-task.sh" />
24+
<File Path="../tests/scripts/test-native-tool.sh" />
25+
</Folder>
26+
<Folder Name="/sln/">
27+
<File Path="../.config/dotnet-tools.json" />
28+
<File Path="../.gitignore" />
29+
<File Path="../.remarkrc.yaml" />
30+
<File Path="../global.json" />
31+
<File Path="../package.json" />
32+
<File Path="../src/mark-shipped.ps1" />
33+
<File Path="Directory.Build.props" />
34+
<File Path="Directory.Packages.props" />
35+
</Folder>
36+
<Folder Name="/workflows/">
37+
<File Path="../.github/dependabot.yml" />
38+
<File Path="../.github/workflows/ci.yml" />
39+
<File Path="../.github/workflows/codeql-analysis.yml" />
40+
<File Path="../.github/workflows/docs.yml" />
41+
<File Path="../.github/workflows/format.yml" />
42+
<File Path="../.github/workflows/homebrew.yml" />
43+
<File Path="../.github/workflows/mkdocs.yml" />
44+
<File Path="../.github/workflows/release.yml" />
45+
<File Path="../.github/workflows/stale.yml" />
46+
<File Path="../.github/workflows/winget.yml" />
47+
</Folder>
48+
<Folder Name="/workflows/_/">
49+
<File Path="../.github/workflows/_artifacts_linux.yml" />
50+
<File Path="../.github/workflows/_artifacts_windows.yml" />
51+
<File Path="../.github/workflows/_build.yml" />
52+
<File Path="../.github/workflows/_docker.yml" />
53+
<File Path="../.github/workflows/_docker_manifests.yml" />
54+
<File Path="../.github/workflows/_prepare.yml" />
55+
<File Path="../.github/workflows/_publish.yml" />
56+
<File Path="../.github/workflows/_unit_tests.yml" />
57+
</Folder>
58+
<Project Path="artifacts/artifacts.csproj" />
59+
<Project Path="build/build.csproj" />
60+
<Project Path="common/common.csproj" />
61+
<Project Path="config/config.csproj" />
62+
<Project Path="docker/docker.csproj" />
63+
<Project Path="docs/docs.csproj" />
64+
<Project Path="publish/publish.csproj" />
65+
<Project Path="release/release.csproj" />
66+
</Solution>

‎build/build/Tasks/Build.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public sealed class Build : FrostingTask<BuildContext>
1111
public override void Run(BuildContext context)
1212
{
1313
context.Information("Builds solution...");
14-
const string sln = "./src/GitVersion.sln";
14+
const string sln = "./src/GitVersion.slnx";
1515

1616
context.DotNetRestore(sln, new DotNetRestoreSettings
1717
{

‎build/build/Tasks/BuildPrepare.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public override void Run(BuildContext context)
1111
{
1212
context.Information("Builds solution...");
1313

14-
const string sln = "./src/GitVersion.sln";
14+
const string sln = "./src/GitVersion.slnx";
1515
context.DotNetRestore(sln,
1616
new()
1717
{

0 commit comments

Comments
 (0)