Skip to content

Commit 34bdf0e

Browse files
committed
int - Migrate to .slnx from .sln
--- Solutions will be editable more easily than before. --- Type: int Breaking: False Doc Required: False Backport Required: False Part: 1/1
1 parent fb33ed5 commit 34bdf0e

File tree

10 files changed

+35
-120
lines changed

10 files changed

+35
-120
lines changed

.github/workflows/release-canary.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
- name: Release Asset Preparation
2828
run: |
2929
cmd.exe /c "tools\build.cmd Debug -p:ContinuousIntegrationBuild=true"
30-
dotnet build -p:Configuration=Debug -p:Platform=x64 public/BassBoom.Installers/BassBoom.Installer.sln
31-
dotnet build -p:Configuration=Debug -p:Platform=ARM64 public/BassBoom.Installers/BassBoom.Installer.sln
30+
dotnet build -p:Configuration=Debug -p:Platform=x64 public/BassBoom.Installers/BassBoom.Installer.slnx
31+
dotnet build -p:Configuration=Debug -p:Platform=ARM64 public/BassBoom.Installers/BassBoom.Installer.slnx
3232
Move-Item public/BassBoom.Installers/BassBoom.InstallerBundle/bin/x64/Debug/BassBoom.InstallerBundle.exe vnd/bassboom-win-x64-installer.exe
3333
Move-Item public/BassBoom.Installers/BassBoom.InstallerBundle/bin/ARM64/Debug/BassBoom.InstallerBundle.exe vnd/bassboom-win-arm64-installer.exe
3434
- uses: actions/upload-artifact@v4

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
cmd.exe /c "tools\pack.cmd"
3131
cmd.exe /c "tools\docgen.cmd"
3232
cmd.exe /c "tools\docgen-pack.cmd"
33-
dotnet build -p:Configuration=Release -p:Platform=x64 public/BassBoom.Installers/BassBoom.Installer.sln
34-
dotnet build -p:Configuration=Release -p:Platform=ARM64 public/BassBoom.Installers/BassBoom.Installer.sln
33+
dotnet build -p:Configuration=Release -p:Platform=x64 public/BassBoom.Installers/BassBoom.Installer.slnx
34+
dotnet build -p:Configuration=Release -p:Platform=ARM64 public/BassBoom.Installers/BassBoom.Installer.slnx
3535
Move-Item public/BassBoom.Installers/BassBoom.InstallerBundle/bin/x64/Release/BassBoom.InstallerBundle.exe tools/bassboom-win-x64-installer.exe
3636
Move-Item public/BassBoom.Installers/BassBoom.InstallerBundle/bin/ARM64/Release/BassBoom.InstallerBundle.exe tools/bassboom-win-arm64-installer.exe
3737
- name: Release Preparation

BassBoom.sln

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

BassBoom.slnx

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Solution>
2+
<Folder Name="/Assets/">
3+
<File Path="CHANGES" />
4+
<File Path="CHANGES.TITLE" />
5+
<File Path="Directory.Build.props" />
6+
</Folder>
7+
<Folder Name="/Private/">
8+
<Project Path="private/BuildTargets/BuildTargets.csproj" />
9+
</Folder>
10+
<Folder Name="/Private/Demos/">
11+
<Project Path="private/BassBoom.Cli/BassBoom.Cli.csproj" />
12+
</Folder>
13+
<Folder Name="/Public/">
14+
<Project Path="public/BassBoom.Basolia/BassBoom.Basolia.csproj" />
15+
<Project Path="public/BassBoom.Native/BassBoom.Native.csproj" />
16+
</Folder>
17+
</Solution>

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ WORKDIR /BB
55
COPY . ./
66

77
# Attempt to build BassBoom
8-
RUN dotnet build "BassBoom.sln" -p:Configuration=Release
8+
RUN dotnet build "BassBoom.slnx" -p:Configuration=Release
99

1010
# Run the ASP.NET image
1111
FROM mcr.microsoft.com/dotnet/aspnet:10.0

public/BassBoom.Installers/BassBoom.Installer.sln

Lines changed: 0 additions & 48 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Solution>
2+
<Configurations>
3+
<Platform Name="ARM64" />
4+
<Platform Name="x64" />
5+
<Platform Name="x86" />
6+
</Configurations>
7+
<Project Path="BassBoom.Installer/BassBoom.Installer.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0" />
8+
<Project Path="BassBoom.InstallerBundle/BassBoom.InstallerBundle.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0" />
9+
</Solution>

vnd/vendor-build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ set DOTNET_NOLOGO=1
1515
set ROOTDIR=%~dp0\..
1616

1717
echo Building with configuration %releaseconfig%...
18-
"%ProgramFiles%\dotnet\dotnet.exe" build "%ROOTDIR%\BassBoom.sln" -p:Configuration=%releaseconfig% %buildoptions%
18+
"%ProgramFiles%\dotnet\dotnet.exe" build "%ROOTDIR%\BassBoom.slnx" -p:Configuration=%releaseconfig% %buildoptions%

vnd/vendor-localize.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set ROOTDIR=%~dp0\..
44
set ROOTDIRFIND=%~dp0..
55

66
echo Restoring NuGet packages...
7-
"%ProgramFiles%\dotnet\dotnet.exe" restore "%ROOTDIR%\BassBoom.sln" --packages "%ROOTDIR%\nuget"
7+
"%ProgramFiles%\dotnet\dotnet.exe" restore "%ROOTDIR%\BassBoom.slnx" --packages "%ROOTDIR%\nuget"
88
if %errorlevel% == 0 goto :copy
99
echo There was an error trying to restore packages (%errorlevel%).
1010
goto :finished

vnd/vendor.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ localize() {
1111

1212
# Restore the packages
1313
echo "Restoring NuGet packages..."
14-
"$dotnetpath" restore "$ROOTDIR/BassBoom.sln" --packages "$ROOTDIR/nuget"
14+
"$dotnetpath" restore "$ROOTDIR/BassBoom.slnx" --packages "$ROOTDIR/nuget"
1515
checkerror $? "Failed to restore NuGet packages"
1616

1717
# Copy dependencies to the "deps" folder underneath the root directory
@@ -53,7 +53,7 @@ build() {
5353

5454
# Now, build.
5555
echo Building with configuration $releaseconf...
56-
"$dotnetpath" build "$ROOTDIR/BassBoom.sln" -p:Configuration=$releaseconf ${@:2}
56+
"$dotnetpath" build "$ROOTDIR/BassBoom.slnx" -p:Configuration=$releaseconf ${@:2}
5757
checkvendorerror $?
5858
}
5959

0 commit comments

Comments
 (0)