Skip to content

Commit 5eb679d

Browse files
tannergoodingtannergooding
authored
Merge pull request #247 from tannergooding/main
Migrate to slnx
2 parents 7b4ce1d + b37c932 commit 5eb679d

File tree

6 files changed

+75
-161
lines changed

6 files changed

+75
-161
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,9 @@ trim_trailing_whitespace = true
3131
# Set file behavior to:
3232
# 2 space indentation
3333
###############################################################################
34-
[*.{cmd,config,csproj,json,props,ps1,resx,sh,targets,yml}]
34+
[*.{cmd,config,csproj,json,props,ps1,resx,sh,slnx,targets,yml}]
3535
indent_size = 2
3636

37-
###############################################################################
38-
# Set file behavior to:
39-
# Windows-style line endings, and
40-
# tabular indentation
41-
###############################################################################
42-
[*.sln]
43-
end_of_line = crlf
44-
indent_style = tab
45-
4637
###############################################################################
4738
# Set file header template to the specified text
4839
###############################################################################

‎.gitattributes‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,10 @@
2121
*.ps1 text eol=lf
2222
*.resx text eol=lf
2323
*.sh text eol=lf
24-
*.sln text eol=lf
24+
*.slnx text eol=lf
2525
*.targets text eol=lf
2626
*.yml text eol=lf
2727

28-
###############################################################################
29-
# Set explicit file behavior to:
30-
# treat as text and
31-
# normalize to Windows-style line endings
32-
###############################################################################
33-
*.sln text eol=crlf
34-
3528
###############################################################################
3629
# Set explicit file behavior to:
3730
# treat as binary

‎LLVMSharp.sln‎

Lines changed: 0 additions & 141 deletions
This file was deleted.

‎LLVMSharp.slnx‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<Solution>
2+
<Folder Name="/.github/" />
3+
<Folder Name="/.github/workflows/">
4+
<File Path=".github/workflows/ci.yml" />
5+
</Folder>
6+
<Folder Name="/packages/" />
7+
<Folder Name="/packages/libLLVM/" />
8+
<Folder Name="/packages/libLLVM/libLLVM.runtime.linux-arm64/">
9+
<File Path="packages/libLLVM/libLLVM.runtime.linux-arm64/libLLVM.runtime.linux-arm64.nuspec" />
10+
</Folder>
11+
<Folder Name="/packages/libLLVM/libLLVM.runtime.linux-x64/">
12+
<File Path="packages/libLLVM/libLLVM.runtime.linux-x64/libLLVM.runtime.linux-x64.nuspec" />
13+
</Folder>
14+
<Folder Name="/packages/libLLVM/libLLVM.runtime.osx-arm64/">
15+
<File Path="packages/libLLVM/libLLVM.runtime.osx-arm64/libLLVM.runtime.osx-arm64.nuspec" />
16+
</Folder>
17+
<Folder Name="/packages/libLLVM/libLLVM.runtime.win-arm64/">
18+
<File Path="packages/libLLVM/libLLVM.runtime.win-arm64/libLLVM.runtime.win-arm64.nuspec" />
19+
</Folder>
20+
<Folder Name="/packages/libLLVM/libLLVM.runtime.win-x64/">
21+
<File Path="packages/libLLVM/libLLVM.runtime.win-x64/libLLVM.runtime.win-x64.nuspec" />
22+
</Folder>
23+
<Folder Name="/packages/libLLVM/libLLVM/">
24+
<File Path="packages/libLLVM/libLLVM/libLLVM.nuspec" />
25+
<File Path="packages/libLLVM/libLLVM/LICENSE.TXT" />
26+
<File Path="packages/libLLVM/libLLVM/runtime.json" />
27+
</Folder>
28+
<Folder Name="/scripts/">
29+
<File Path="scripts/build.ps1" />
30+
<File Path="scripts/build.sh" />
31+
<File Path="scripts/cibuild.cmd" />
32+
<File Path="scripts/cibuild.sh" />
33+
<File Path="scripts/SignClientFileList.txt" />
34+
<File Path="scripts/SignClientSettings.json" />
35+
</Folder>
36+
<Folder Name="/Solution Items/">
37+
<File Path=".editorconfig" />
38+
<File Path=".gitattributes" />
39+
<File Path=".gitignore" />
40+
<File Path="build.cmd" />
41+
<File Path="build.sh" />
42+
<File Path="CODE_OF_CONDUCT.md" />
43+
<File Path="Directory.Build.props" />
44+
<File Path="Directory.Build.targets" />
45+
<File Path="Directory.Packages.props" />
46+
<File Path="exclusion.dic" />
47+
<File Path="global.json" />
48+
<File Path="LICENSE.md" />
49+
<File Path="NOTICE.md" />
50+
<File Path="NuGet.config" />
51+
<File Path="Open.snk" />
52+
<File Path="pack.cmd" />
53+
<File Path="pack.sh" />
54+
<File Path="README.md" />
55+
<File Path="restore.cmd" />
56+
<File Path="restore.sh" />
57+
<File Path="test.cmd" />
58+
<File Path="test.sh" />
59+
</Folder>
60+
<Folder Name="/sources/">
61+
<File Path="sources/Directory.Build.props" />
62+
<File Path="sources/Directory.Build.targets" />
63+
<Project Path="sources/LLVMSharp.Interop/LLVMSharp.Interop.csproj" />
64+
<Project Path="sources/LLVMSharp/LLVMSharp.csproj" />
65+
</Folder>
66+
<Folder Name="/tests/">
67+
<File Path="tests/Directory.Build.props" />
68+
<File Path="tests/Directory.Build.targets" />
69+
<Project Path="tests/LLVMSharp.UnitTests/LLVMSharp.UnitTests.csproj" />
70+
</Folder>
71+
</Solution>

‎scripts/build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ try {
103103
$RepoRoot = Join-Path -Path $PSScriptRoot -ChildPath ".."
104104

105105
if ($solution -eq "") {
106-
$solution = Join-Path -Path $RepoRoot -ChildPath "LLVMSharp.sln"
106+
$solution = Join-Path -Path $RepoRoot -ChildPath "LLVMSharp.slnx"
107107
}
108108

109109
$ArtifactsDir = Join-Path -Path $RepoRoot -ChildPath "artifacts"

‎scripts/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ fi
184184
RepoRoot="$ScriptRoot/.."
185185

186186
if [[ -z "$solution" ]]; then
187-
solution="$RepoRoot/LLVMSharp.sln"
187+
solution="$RepoRoot/LLVMSharp.slnx"
188188
fi
189189

190190
ArtifactsDir="$RepoRoot/artifacts"

0 commit comments

Comments
 (0)