Skip to content

Commit

Permalink
change file ends
Browse files Browse the repository at this point in the history
	- \r\n to \n (gits fault)
  • Loading branch information
Phoenixfirewingz committed Jun 21, 2023
1 parent 987d25c commit efd685b
Show file tree
Hide file tree
Showing 34 changed files with 1,569 additions and 1,572 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/check-commit-message.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
name: 'Check commit message style'
on:
pull_request:
types:
- opened
- edited
- reopened
- synchronize
push:
branches:
- main
- dev

jobs:
check-commit-message-style:
name: Check commit message style
runs-on: ubuntu-latest
steps:
- name: Check
name: 'Check commit message style'
on:
pull_request:
types:
- opened
- edited
- reopened
- synchronize
push:
branches:
- main
- dev

jobs:
check-commit-message-style:
name: Check commit message style
runs-on: ubuntu-latest
steps:
- name: Check
uses: mristin/[email protected]
58 changes: 29 additions & 29 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
---
name: Lint Code Base
on:
push:
pull_request:
branches: [dev, main]
jobs:
build:
# Name the Job
name: Lint Code Base
# Set the agent to run on
runs-on: ubuntu-latest
permissions:
contents: read
packages: read
statuses: write
steps:
- name: Checkout Code
uses: actions/checkout@v3
with:
# Full git history is needed to get a proper
# list of changed files within `super-linter`
fetch-depth: 0
- name: Lint Code Base
uses: github/super-linter@v5
env:
VALIDATE_ALL_CODEBASE: false
# Change to 'master' if your main branch differs
DEFAULT_BRANCH: main
---
name: Lint Code Base
on:
push:
pull_request:
branches: [dev, main]
jobs:
build:
# Name the Job
name: Lint Code Base
# Set the agent to run on
runs-on: ubuntu-latest
permissions:
contents: read
packages: read
statuses: write
steps:
- name: Checkout Code
uses: actions/checkout@v3
with:
# Full git history is needed to get a proper
# list of changed files within `super-linter`
fetch-depth: 0
- name: Lint Code Base
uses: github/super-linter@v5
env:
VALIDATE_ALL_CODEBASE: false
# Change to 'master' if your main branch differs
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.vs
packages
bin
obj
.vs
packages
bin
obj
Properties
14 changes: 7 additions & 7 deletions Program.axaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Application xmlns:avalonia="clr-namespace:Avalonia;assembly=Avalonia.Controls"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="SquareSmash.Program">
<Application.Styles>
<FluentTheme Mode="Light"/>
</Application.Styles>
<Application xmlns:avalonia="clr-namespace:Avalonia;assembly=Avalonia.Controls"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="SquareSmash.Program">
<Application.Styles>
<FluentTheme Mode="Light"/>
</Application.Styles>
</Application>
82 changes: 41 additions & 41 deletions Program.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using SquareSmash.renderer.Windows;
using System;

namespace SquareSmash;

public partial class Program : Application
{
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
}

public override void OnFrameworkInitializationCompleted()
{
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
desktop.MainWindow = new DiscWindow();
}

base.OnFrameworkInitializationCompleted();
}


}

public static class Entry
{
[STAThread]
public static void Main(string[] args)
{
/*foreach(string s in Assembly.GetExecutingAssembly().GetManifestResourceNames())
{
Console.WriteLine(s);
}*/
Console.Write($"DISCout Copyright (C) 2023-{DateTime.Now.Year} DISC (Digital Independant specialist College) \nThis program comes with ABSOLUTELY NO WARRANTY;\n");
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
}
public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<Program>().UsePlatformDetect().With(new Win32PlatformOptions { UseWgl = true }).LogToTrace();
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using SquareSmash.renderer.Windows;
using System;

namespace SquareSmash;

public partial class Program : Application
{
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
}

public override void OnFrameworkInitializationCompleted()
{
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
desktop.MainWindow = new DiscWindow();
}

base.OnFrameworkInitializationCompleted();
}


}

public static class Entry
{
[STAThread]
public static void Main(string[] args)
{
/*foreach(string s in Assembly.GetExecutingAssembly().GetManifestResourceNames())
{
Console.WriteLine(s);
}*/
Console.Write($"DISCout Copyright (C) 2023-{DateTime.Now.Year} DISC (Digital Independant specialist College) \nThis program comes with ABSOLUTELY NO WARRANTY;\n");
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
}
public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<Program>().UsePlatformDetect().With(new Win32PlatformOptions { UseWgl = true }).LogToTrace();
}
104 changes: 52 additions & 52 deletions SquareSmash.csproj
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!--#if (UseCompiledBindings) -->
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<StartupObject></StartupObject>
<!--#endif -->
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>0108</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<NoWarn>0108</NoWarn>
</PropertyGroup>

<!--#if (AvaloniaStableChosen) -->
<ItemGroup>
<Folder Include="renderer\Windows\Controls\" />
<ProjectCapability Include="Avalonia" />
</ItemGroup>
<!--#endif -->

<ItemGroup>
<PackageReference Include="NAudio" Version="2.1.0" />
<PackageReference Include="OpenTK.Mathematics" Version="4.7.7" />
<PackageReference Include="StbImageSharp" Version="2.27.13" PrivateAssets="all" />
<PackageReference Include="Avalonia" Version="0.10.21" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.21" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.21" />
<!--#if (AvaloniaStableChosen) -->
<PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
<!--#endif -->
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="assets\**" />
</ItemGroup>

<ItemGroup>
<None Remove="assets\sounds\click.wav" />
</ItemGroup>

<ItemGroup>
<Compile Update="renderer\Windows\PopUpWindow.axaml.cs">
<DependentUpon>PopUpWindow.axaml</DependentUpon>
</Compile>
</ItemGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!--#if (UseCompiledBindings) -->
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<StartupObject></StartupObject>
<!--#endif -->
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>0108</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<NoWarn>0108</NoWarn>
</PropertyGroup>

<!--#if (AvaloniaStableChosen) -->
<ItemGroup>
<Folder Include="renderer\Windows\Controls\" />
<ProjectCapability Include="Avalonia" />
</ItemGroup>
<!--#endif -->

<ItemGroup>
<PackageReference Include="NAudio" Version="2.1.0" />
<PackageReference Include="OpenTK.Mathematics" Version="4.7.7" />
<PackageReference Include="StbImageSharp" Version="2.27.13" PrivateAssets="all" />
<PackageReference Include="Avalonia" Version="0.10.21" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.21" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.21" />
<!--#if (AvaloniaStableChosen) -->
<PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
<!--#endif -->
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="assets\**" />
</ItemGroup>

<ItemGroup>
<None Remove="assets\sounds\click.wav" />
</ItemGroup>

<ItemGroup>
<Compile Update="renderer\Windows\PopUpWindow.axaml.cs">
<DependentUpon>PopUpWindow.axaml</DependentUpon>
</Compile>
</ItemGroup>
</Project>
50 changes: 25 additions & 25 deletions SquareSmash.sln
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.33627.172
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SquareSmash", "SquareSmash.csproj", "{9D3B153B-BB11-4B78-BC27-8EC36E25C050}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9D3B153B-BB11-4B78-BC27-8EC36E25C050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D3B153B-BB11-4B78-BC27-8EC36E25C050}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D3B153B-BB11-4B78-BC27-8EC36E25C050}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D3B153B-BB11-4B78-BC27-8EC36E25C050}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5FB3051D-27D4-440B-B79F-4A4E2457C6FC}
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.33627.172
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SquareSmash", "SquareSmash.csproj", "{9D3B153B-BB11-4B78-BC27-8EC36E25C050}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9D3B153B-BB11-4B78-BC27-8EC36E25C050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D3B153B-BB11-4B78-BC27-8EC36E25C050}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D3B153B-BB11-4B78-BC27-8EC36E25C050}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D3B153B-BB11-4B78-BC27-8EC36E25C050}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5FB3051D-27D4-440B-B79F-4A4E2457C6FC}
EndGlobalSection
EndGlobal
Loading

0 comments on commit efd685b

Please sign in to comment.