Browse Source

[csharp] spine-csharp.csproj is a .NET Standard 2.0 project now, fixed format-csharp.sh

Mario Zechner 1 month ago
parent
commit
e69bc5562c
2 changed files with 31 additions and 109 deletions
  1. 20 5
      formatters/format-csharp.sh
  2. 11 104
      spine-csharp/spine-csharp.csproj

+ 20 - 5
formatters/format-csharp.sh

@@ -6,20 +6,35 @@ echo "Formatting C# files..."
 
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-if command -v dotnet-format &> /dev/null; then
+if command -v dotnet &> /dev/null; then
     # Copy .editorconfig to C# directories
     cp .editorconfig ../spine-csharp/ 2>/dev/null || true
     cp .editorconfig ../spine-monogame/ 2>/dev/null || true
     cp .editorconfig ../spine-unity/ 2>/dev/null || true
 
-    dotnet-format ../spine-csharp/spine-csharp.sln || true
-    dotnet-format -f ../spine-monogame || true
-    dotnet-format -f ../spine-unity || true
+    # Format spine-csharp
+    cd ../spine-csharp && dotnet format spine-csharp.csproj || echo "Warning: Some issues with spine-csharp formatting"
+    cd ../formatters
+    
+    # Format spine-monogame
+    cd ../spine-monogame && dotnet format --no-restore || echo "Warning: Some issues with spine-monogame formatting"
+    cd ../formatters
+    
+    # Format spine-unity - look for .cs files directly
+    if [ -d ../spine-unity ]; then
+        echo "Formatting spine-unity C# files directly..."
+        cd ../spine-unity
+        # Find all .cs files and format them using dotnet format whitespace
+        find . -name "*.cs" -type f -not -path "./Library/*" -not -path "./Temp/*" -not -path "./obj/*" -not -path "./bin/*" | while read -r file; do
+            dotnet format whitespace --include "$file" --no-restore 2>/dev/null || true
+        done
+        cd ../formatters
+    fi
 
     # Clean up .editorconfig files
     rm -f ../spine-csharp/.editorconfig
     rm -f ../spine-monogame/.editorconfig
     rm -f ../spine-unity/.editorconfig
 else
-    echo "Warning: dotnet-format not found. Skipping C# formatting."
+    echo "Warning: dotnet not found. Skipping C# formatting."
 fi

+ 11 - 104
spine-csharp/spine-csharp.csproj

@@ -1,113 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <ProjectGuid>{94144E22-2431-4A8F-AC04-DEC22F7EDD8F}</ProjectGuid>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Spine</RootNamespace>
     <AssemblyName>spine-csharp</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <XnaFrameworkVersion>v4.0</XnaFrameworkVersion>
-    <XnaPlatform>Windows</XnaPlatform>
-    <XnaProfile>HiDef</XnaProfile>
-    <XnaCrossPlatformGroupID>99dfd52d-8beb-4e5c-a68b-365be39e8064</XnaCrossPlatformGroupID>
-    <XnaOutputType>Library</XnaOutputType>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;WINDOWS</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Net" />
+    <Compile Include="src\**\*.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="src\Animation.cs" />
-    <Compile Include="src\AnimationState.cs" />
-    <Compile Include="src\AnimationStateData.cs" />
-    <Compile Include="src\Atlas.cs" />
-    <Compile Include="src\Attachments\AtlasAttachmentLoader.cs" />
-    <Compile Include="src\Attachments\Attachment.cs" />
-    <Compile Include="src\Attachments\AttachmentLoader.cs" />
-    <Compile Include="src\Attachments\AttachmentType.cs" />
-    <Compile Include="src\Attachments\BoundingBoxAttachment.cs" />
-    <Compile Include="src\Attachments\ClippingAttachment.cs" />
-    <Compile Include="src\Attachments\IHasTextureRegion.cs" />
-    <Compile Include="src\Attachments\MeshAttachment.cs" />
-    <Compile Include="src\Attachments\PathAttachment.cs" />
-    <Compile Include="src\Attachments\PointAttachment.cs" />
-    <Compile Include="src\Attachments\RegionAttachment.cs" />
-    <Compile Include="src\Attachments\Sequence.cs" />
-    <Compile Include="src\Attachments\VertexAttachment.cs" />
-    <Compile Include="src\BlendMode.cs" />
-    <Compile Include="src\Bone.cs" />
-    <Compile Include="src\BoneData.cs" />
-    <Compile Include="src\ConstraintData.cs" />
-    <Compile Include="src\PhysicsConstraint.cs" />
-    <Compile Include="src\PhysicsConstraintData.cs" />
-    <Compile Include="src\SkeletonLoader.cs" />
-    <Compile Include="src\TextureRegion.cs" />
-    <Compile Include="src\Triangulator.cs" />
-    <Compile Include="src\Event.cs" />
-    <Compile Include="src\EventData.cs" />
-    <Compile Include="src\ExposedList.cs" />
-    <Compile Include="src\IkConstraint.cs" />
-    <Compile Include="src\IkConstraintData.cs" />
-    <Compile Include="src\IUpdatable.cs" />
-    <Compile Include="src\Json.cs" />
-    <Compile Include="src\MathUtils.cs" />
-    <Compile Include="src\PathConstraint.cs" />
-    <Compile Include="src\PathConstraintData.cs" />
-    <Compile Include="src\Skeleton.cs" />
-    <Compile Include="src\SkeletonBinary.cs" />
-    <Compile Include="src\SkeletonBounds.cs" />
-    <Compile Include="src\SkeletonClipping.cs" />
-    <Compile Include="src\SkeletonData.cs" />
-    <Compile Include="src\SkeletonJson.cs" />
-    <Compile Include="src\Skin.cs" />
-    <Compile Include="src\Slot.cs" />
-    <Compile Include="src\SlotData.cs" />
-    <Compile Include="src\TransformConstraint.cs" />
-    <Compile Include="src\TransformConstraintData.cs" />
+    <None Remove="src\ColorUnity.cs.meta" />
+    <None Remove="src\ColorMono.cs.meta" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!--
-      To modify your build process, add your task inside one of the targets below and uncomment it.
-      Other similar extension points exist, see Microsoft.Common.targets.
-      <Target Name="BeforeBuild">
-      </Target>
-      <Target Name="AfterBuild">
-      </Target>
-    -->
+
 </Project>