Skip to content

Commit 2c09059

Browse files
authored
chore: simplify project structure (#62)
1 parent ed463a6 commit 2c09059

28 files changed

Lines changed: 184 additions & 210 deletions

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ jobs:
3737
run: dotnet test --no-build
3838

3939
- name: Publish
40-
run: dotnet publish SharpFM.App/SharpFM.App.csproj --runtime "${{ matrix.target }}" -c Debug
40+
run: dotnet publish SharpFM.csproj --runtime "${{ matrix.target }}" -c Debug

.github/workflows/release-artifacts.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
shell: bash
3333
run: |
3434
tag=$(git describe --tags --abbrev=0)
35-
release_name="SharpFM.App-$tag-${{ matrix.target }}"
35+
release_name="SharpFM-$tag-${{ matrix.target }}"
3636
3737
# Build everything
38-
dotnet publish SharpFM.App/SharpFM.App.csproj --runtime "${{ matrix.target }}" -c Release -o "$release_name"
38+
dotnet publish SharpFM.csproj --runtime "${{ matrix.target }}" -c Release -o "$release_name"
3939
4040
# Pack files
4141
if [ "${{ matrix.target }}" == "win-x64" ]; then
@@ -51,6 +51,6 @@ jobs:
5151
- name: Publish
5252
uses: softprops/action-gh-release@v1
5353
with:
54-
files: "SharpFM.App*"
54+
files: "SharpFM*"
5555
env:
5656
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"type": "coreclr",
1010
"request": "launch",
1111
"preLaunchTask": "build",
12-
"program": "${workspaceFolder}/SharpFM.App/bin/Debug/net8.0/win-x64/SharpFM.App.dll",
12+
"program": "${workspaceFolder}/bin/Debug/net8.0/win-x64/SharpFM.dll",
1313
"args": [],
14-
"cwd": "${workspaceFolder}/SharpFM.App",
14+
"cwd": "${workspaceFolder}",
1515
"console": "internalConsole",
1616
"stopAtEntry": false
1717
},
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Application xmlns="https://github.com/avaloniaui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
x:Class="SharpFM.App.App"
3+
x:Class="SharpFM.App"
44
RequestedThemeVariant="Default">
55
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
66

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using Avalonia;
22
using Avalonia.Controls.ApplicationLifetimes;
33
using Avalonia.Markup.Xaml;
4-
using SharpFM.App.ViewModels;
4+
using SharpFM.ViewModels;
55
using Microsoft.Extensions.Logging;
66
using NLog.Extensions.Logging;
77

8-
namespace SharpFM.App;
8+
namespace SharpFM;
99

1010
public partial class App : Application
1111
{
File renamed without changes.

SharpFM.App/Assets/noun-sharp-teeth-monster-4226695.small.png renamed to Assets/noun-sharp-teeth-monster-4226695.small.png

File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Avalonia.Logging;
44
using NLog;
55

6-
namespace SharpFM.App;
6+
namespace SharpFM;
77

88
/// <summary>
99
/// Avalonia Log Sink that writes to NLog Loggers.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing
22

3-
Contributions are welcome! As an open source project, any help we can get fixing bugs or adding features is always appreciated. In all cases, PRs will be reviewed with an eye toward future maintainability, so things like good comments, unit test coverage, and thorough design are importat considerations. If you decide to work on a bug or feature from our issue list, please be prepared to work through design or maintenance issues in the PR.
3+
Contributions are welcome! As an open source project, any help we can get fixing bugs or adding features is always appreciated. In all cases, PRs will be reviewed with an eye toward future maintainability, so things like good comments and thorough design are important considerations. If you decide to work on a bug or feature from our issue list, please be prepared to work through design or maintenance issues in the PR.
44

55
## Features
66

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Collections.ObjectModel;
43
using System.IO;
54
using System.Linq;
65
using System.Text;
76
using System.Text.RegularExpressions;
87
using System.Xml;
98
using System.Xml.Linq;
109

11-
namespace SharpFM.Core;
10+
namespace SharpFM;
1211

1312
public class FileMakerClip
1413
{

0 commit comments

Comments
 (0)