Merge Release into Develop (#912)

* Make CurrentFrame return the actual frame index from the source atlas * Start the animation controller playing, don't make the consumer manually call it initially * Play is automatically called in the controller ctor * Added property to get name of current animation * Only copy reference files if user opts in by specifying property in csproj * Update Kni solution to new project structure * Update Fna solution to new project structure * Bump version number to 4.0.0 * Update release workflow * Remove old test
craftworkgames · Jul 8, 2024 · 0fe1064 · 0fe1064
1 parent 3a5269c
commit 0fe1064
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 313 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -14,25 +14,30 @@ on:
       prerelease:
         description: 'Is this a prerelease?'
         required: true
-        default: 'true'
+        type: boolean
+        default: true
       source-feed:
-        description: |
-          Which source feed to publish to?
-          (Valid values are 'NuGet' or 'GitHub')
+        description: 'Which source feed to publish to?'
         required: true
-        default: GitHub
+        type: choice
+        options:
+          - GitHub
+          - NuGet
+        default: 'GitHub'
 
 jobs:
   build:
     name: "Build MonoGame.Extended"
     runs-on: ubuntu-latest
     env:
-      IS_PRERELEASE:  ${{ inputs.prerelease == 'true' }}
-      BUILD_NUMBER: ${{ inputs.prerelease == 'true' && github.run_number || '' }}
+      IS_PRERELEASE:  ${{ inputs.prerelease || '' }}
+      BUILD_NUMBER: ${{ inputs.prerelease && github.run_number || '' }}
 
     steps:
       - name: Clone Repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.prerelease && 'develop' || 'main' }}
 
       - name: Setup Dotnet
         uses: actions/setup-dotnet@v4

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <MonoGameExtendedVersion>3.9.0</MonoGameExtendedVersion>
+        <MonoGameExtendedVersion>4.0.0</MonoGameExtendedVersion>
         <IsPrerelease Condition="'$(IS_PRERELEASE)' != ''">-prerelease</IsPrerelease>
         <BuildNumber Condition="'$(BUILD_NUMBER)' != ''">.$(BUILD_NUMBER)</BuildNumber>
         <Version>$(MonoGameExtendedVersion)$(IsPrerelease)$(BuildNumber)</Version>

diff --git a/FNA.Extended.sln b/FNA.Extended.sln
@@ -7,34 +7,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "source", "source", "{2BD6F8
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended", "source\MonoGame.Extended\FNA.Extended.csproj", "{C8717306-E333-418E-86A7-8D9781D7FDAC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Animations", "source\MonoGame.Extended.Animations\FNA.Extended.Animations.csproj", "{71A8D50C-DAF1-4D08-99FD-2EACD6EAD5E3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Collisions", "source\MonoGame.Extended.Collisions\FNA.Extended.Collisions.csproj", "{7F60B59F-4B84-401F-8A13-AAA3F0B9E4A5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Entities", "source\MonoGame.Extended.Entities\FNA.Extended.Entities.csproj", "{CD5C1878-13B6-4FAD-91AE-AEA3C1520E38}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Graphics", "source\MonoGame.Extended.Graphics\FNA.Extended.Graphics.csproj", "{56627685-4BA7-44E3-ACA6-F2990DE089F2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Input", "source\MonoGame.Extended.Input\FNA.Extended.Input.csproj", "{76B39424-7884-4EEC-A8D5-5126B29941B7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Particles", "source\MonoGame.Extended.Particles\FNA.Extended.Particles.csproj", "{BE74938D-9004-4D36-AD50-5C6C141A7180}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Tiled", "source\MonoGame.Extended.Tiled\FNA.Extended.Tiled.csproj", "{572C908D-4627-4678-9641-D4950DE43B13}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Tweening", "source\MonoGame.Extended.Tweening\FNA.Extended.Tweening.csproj", "{F144A062-4FF3-44EC-9A04-31C654B436B0}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{61C82014-E3A9-4AB3-8705-FBBD5F799BA6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Collisions.Tests", "tests\MonoGame.Extended.Collisions.Tests\FNA.Extended.Collisions.Tests.csproj", "{58F88A3C-C09F-4664-A34E-60E89252870A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Entities.Tests", "tests\MonoGame.Extended.Entities.Tests\FNA.Extended.Entities.Tests.csproj", "{D3B0E350-B92E-4E49-99A3-68E66CB53F16}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Tests", "tests\MonoGame.Extended.Tests\FNA.Extended.Tests.csproj", "{E1339B07-EB0B-454F-9803-E923843DB5C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Tiled.Tests", "tests\MonoGame.Extended.Tiled.Tests\FNA.Extended.Tiled.Tests.csproj", "{BF0EC593-4BAB-424F-B7E9-BB13EC78A0E5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Extended.Tweening.Tests", "tests\MonoGame.Extended.Tweening.Tests\FNA.Extended.Tweening.Tests.csproj", "{C2A9982B-7BF7-4243-9E05-CFD31752B6DC}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FNA", "FNA", "{4B7E02CB-D58F-4326-A0A4-7AE70E47F8E3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.NetStandard", "..\FNA\FNA.NetStandard.csproj", "{E628BEDB-B51C-42ED-8E2B-FD8CA2A3BF3B}"
@@ -55,86 +31,6 @@ Global
 		{C8717306-E333-418E-86A7-8D9781D7FDAC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C8717306-E333-418E-86A7-8D9781D7FDAC}.Release|x86.ActiveCfg = Release|Any CPU
 		{C8717306-E333-418E-86A7-8D9781D7FDAC}.Release|x86.Build.0 = Release|Any CPU
-		{71A8D50C-DAF1-4D08-99FD-2EACD6EAD5E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71A8D50C-DAF1-4D08-99FD-2EACD6EAD5E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71A8D50C-DAF1-4D08-99FD-2EACD6EAD5E3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71A8D50C-DAF1-4D08-99FD-2EACD6EAD5E3}.Debug|x86.Build.0 = Debug|Any CPU
-		{71A8D50C-DAF1-4D08-99FD-2EACD6EAD5E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71A8D50C-DAF1-4D08-99FD-2EACD6EAD5E3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71A8D50C-DAF1-4D08-99FD-2EACD6EAD5E3}.Release|x86.ActiveCfg = Release|Any CPU
-		{71A8D50C-DAF1-4D08-99FD-2EACD6EAD5E3}.Release|x86.Build.0 = Release|Any CPU
-		{7F60B59F-4B84-401F-8A13-AAA3F0B9E4A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F60B59F-4B84-401F-8A13-AAA3F0B9E4A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F60B59F-4B84-401F-8A13-AAA3F0B9E4A5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7F60B59F-4B84-401F-8A13-AAA3F0B9E4A5}.Debug|x86.Build.0 = Debug|Any CPU
-		{7F60B59F-4B84-401F-8A13-AAA3F0B9E4A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F60B59F-4B84-401F-8A13-AAA3F0B9E4A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F60B59F-4B84-401F-8A13-AAA3F0B9E4A5}.Release|x86.ActiveCfg = Release|Any CPU
-		{7F60B59F-4B84-401F-8A13-AAA3F0B9E4A5}.Release|x86.Build.0 = Release|Any CPU
-		{CD5C1878-13B6-4FAD-91AE-AEA3C1520E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD5C1878-13B6-4FAD-91AE-AEA3C1520E38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD5C1878-13B6-4FAD-91AE-AEA3C1520E38}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CD5C1878-13B6-4FAD-91AE-AEA3C1520E38}.Debug|x86.Build.0 = Debug|Any CPU
-		{CD5C1878-13B6-4FAD-91AE-AEA3C1520E38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CD5C1878-13B6-4FAD-91AE-AEA3C1520E38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CD5C1878-13B6-4FAD-91AE-AEA3C1520E38}.Release|x86.ActiveCfg = Release|Any CPU
-		{CD5C1878-13B6-4FAD-91AE-AEA3C1520E38}.Release|x86.Build.0 = Release|Any CPU
-		{56627685-4BA7-44E3-ACA6-F2990DE089F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56627685-4BA7-44E3-ACA6-F2990DE089F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56627685-4BA7-44E3-ACA6-F2990DE089F2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{56627685-4BA7-44E3-ACA6-F2990DE089F2}.Debug|x86.Build.0 = Debug|Any CPU
-		{56627685-4BA7-44E3-ACA6-F2990DE089F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{56627685-4BA7-44E3-ACA6-F2990DE089F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{56627685-4BA7-44E3-ACA6-F2990DE089F2}.Release|x86.ActiveCfg = Release|Any CPU
-		{56627685-4BA7-44E3-ACA6-F2990DE089F2}.Release|x86.Build.0 = Release|Any CPU
-		{76B39424-7884-4EEC-A8D5-5126B29941B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76B39424-7884-4EEC-A8D5-5126B29941B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76B39424-7884-4EEC-A8D5-5126B29941B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{76B39424-7884-4EEC-A8D5-5126B29941B7}.Debug|x86.Build.0 = Debug|Any CPU
-		{76B39424-7884-4EEC-A8D5-5126B29941B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76B39424-7884-4EEC-A8D5-5126B29941B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76B39424-7884-4EEC-A8D5-5126B29941B7}.Release|x86.ActiveCfg = Release|Any CPU
-		{76B39424-7884-4EEC-A8D5-5126B29941B7}.Release|x86.Build.0 = Release|Any CPU
-		{BE74938D-9004-4D36-AD50-5C6C141A7180}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE74938D-9004-4D36-AD50-5C6C141A7180}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE74938D-9004-4D36-AD50-5C6C141A7180}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BE74938D-9004-4D36-AD50-5C6C141A7180}.Debug|x86.Build.0 = Debug|Any CPU
-		{BE74938D-9004-4D36-AD50-5C6C141A7180}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE74938D-9004-4D36-AD50-5C6C141A7180}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE74938D-9004-4D36-AD50-5C6C141A7180}.Release|x86.ActiveCfg = Release|Any CPU
-		{BE74938D-9004-4D36-AD50-5C6C141A7180}.Release|x86.Build.0 = Release|Any CPU
-		{572C908D-4627-4678-9641-D4950DE43B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{572C908D-4627-4678-9641-D4950DE43B13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{572C908D-4627-4678-9641-D4950DE43B13}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{572C908D-4627-4678-9641-D4950DE43B13}.Debug|x86.Build.0 = Debug|Any CPU
-		{572C908D-4627-4678-9641-D4950DE43B13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{572C908D-4627-4678-9641-D4950DE43B13}.Release|Any CPU.Build.0 = Release|Any CPU
-		{572C908D-4627-4678-9641-D4950DE43B13}.Release|x86.ActiveCfg = Release|Any CPU
-		{572C908D-4627-4678-9641-D4950DE43B13}.Release|x86.Build.0 = Release|Any CPU
-		{F144A062-4FF3-44EC-9A04-31C654B436B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F144A062-4FF3-44EC-9A04-31C654B436B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F144A062-4FF3-44EC-9A04-31C654B436B0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F144A062-4FF3-44EC-9A04-31C654B436B0}.Debug|x86.Build.0 = Debug|Any CPU
-		{F144A062-4FF3-44EC-9A04-31C654B436B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F144A062-4FF3-44EC-9A04-31C654B436B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F144A062-4FF3-44EC-9A04-31C654B436B0}.Release|x86.ActiveCfg = Release|Any CPU
-		{F144A062-4FF3-44EC-9A04-31C654B436B0}.Release|x86.Build.0 = Release|Any CPU
-		{58F88A3C-C09F-4664-A34E-60E89252870A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58F88A3C-C09F-4664-A34E-60E89252870A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58F88A3C-C09F-4664-A34E-60E89252870A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58F88A3C-C09F-4664-A34E-60E89252870A}.Debug|x86.Build.0 = Debug|Any CPU
-		{58F88A3C-C09F-4664-A34E-60E89252870A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58F88A3C-C09F-4664-A34E-60E89252870A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58F88A3C-C09F-4664-A34E-60E89252870A}.Release|x86.ActiveCfg = Release|Any CPU
-		{58F88A3C-C09F-4664-A34E-60E89252870A}.Release|x86.Build.0 = Release|Any CPU
-		{D3B0E350-B92E-4E49-99A3-68E66CB53F16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3B0E350-B92E-4E49-99A3-68E66CB53F16}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3B0E350-B92E-4E49-99A3-68E66CB53F16}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D3B0E350-B92E-4E49-99A3-68E66CB53F16}.Debug|x86.Build.0 = Debug|Any CPU
-		{D3B0E350-B92E-4E49-99A3-68E66CB53F16}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3B0E350-B92E-4E49-99A3-68E66CB53F16}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3B0E350-B92E-4E49-99A3-68E66CB53F16}.Release|x86.ActiveCfg = Release|Any CPU
-		{D3B0E350-B92E-4E49-99A3-68E66CB53F16}.Release|x86.Build.0 = Release|Any CPU
 		{E1339B07-EB0B-454F-9803-E923843DB5C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1339B07-EB0B-454F-9803-E923843DB5C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E1339B07-EB0B-454F-9803-E923843DB5C4}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -143,22 +39,6 @@ Global
 		{E1339B07-EB0B-454F-9803-E923843DB5C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E1339B07-EB0B-454F-9803-E923843DB5C4}.Release|x86.ActiveCfg = Release|Any CPU
 		{E1339B07-EB0B-454F-9803-E923843DB5C4}.Release|x86.Build.0 = Release|Any CPU
-		{BF0EC593-4BAB-424F-B7E9-BB13EC78A0E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF0EC593-4BAB-424F-B7E9-BB13EC78A0E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF0EC593-4BAB-424F-B7E9-BB13EC78A0E5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BF0EC593-4BAB-424F-B7E9-BB13EC78A0E5}.Debug|x86.Build.0 = Debug|Any CPU
-		{BF0EC593-4BAB-424F-B7E9-BB13EC78A0E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BF0EC593-4BAB-424F-B7E9-BB13EC78A0E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF0EC593-4BAB-424F-B7E9-BB13EC78A0E5}.Release|x86.ActiveCfg = Release|Any CPU
-		{BF0EC593-4BAB-424F-B7E9-BB13EC78A0E5}.Release|x86.Build.0 = Release|Any CPU
-		{C2A9982B-7BF7-4243-9E05-CFD31752B6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2A9982B-7BF7-4243-9E05-CFD31752B6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2A9982B-7BF7-4243-9E05-CFD31752B6DC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C2A9982B-7BF7-4243-9E05-CFD31752B6DC}.Debug|x86.Build.0 = Debug|Any CPU
-		{C2A9982B-7BF7-4243-9E05-CFD31752B6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2A9982B-7BF7-4243-9E05-CFD31752B6DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2A9982B-7BF7-4243-9E05-CFD31752B6DC}.Release|x86.ActiveCfg = Release|Any CPU
-		{C2A9982B-7BF7-4243-9E05-CFD31752B6DC}.Release|x86.Build.0 = Release|Any CPU
 		{E628BEDB-B51C-42ED-8E2B-FD8CA2A3BF3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E628BEDB-B51C-42ED-8E2B-FD8CA2A3BF3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E628BEDB-B51C-42ED-8E2B-FD8CA2A3BF3B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -173,19 +53,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{C8717306-E333-418E-86A7-8D9781D7FDAC} = {2BD6F851-7287-4361-85AB-DAE9DF30D932}
-		{71A8D50C-DAF1-4D08-99FD-2EACD6EAD5E3} = {2BD6F851-7287-4361-85AB-DAE9DF30D932}
-		{7F60B59F-4B84-401F-8A13-AAA3F0B9E4A5} = {2BD6F851-7287-4361-85AB-DAE9DF30D932}
-		{CD5C1878-13B6-4FAD-91AE-AEA3C1520E38} = {2BD6F851-7287-4361-85AB-DAE9DF30D932}
-		{56627685-4BA7-44E3-ACA6-F2990DE089F2} = {2BD6F851-7287-4361-85AB-DAE9DF30D932}
-		{76B39424-7884-4EEC-A8D5-5126B29941B7} = {2BD6F851-7287-4361-85AB-DAE9DF30D932}
-		{BE74938D-9004-4D36-AD50-5C6C141A7180} = {2BD6F851-7287-4361-85AB-DAE9DF30D932}
-		{572C908D-4627-4678-9641-D4950DE43B13} = {2BD6F851-7287-4361-85AB-DAE9DF30D932}
-		{F144A062-4FF3-44EC-9A04-31C654B436B0} = {2BD6F851-7287-4361-85AB-DAE9DF30D932}
-		{58F88A3C-C09F-4664-A34E-60E89252870A} = {61C82014-E3A9-4AB3-8705-FBBD5F799BA6}
-		{D3B0E350-B92E-4E49-99A3-68E66CB53F16} = {61C82014-E3A9-4AB3-8705-FBBD5F799BA6}
 		{E1339B07-EB0B-454F-9803-E923843DB5C4} = {61C82014-E3A9-4AB3-8705-FBBD5F799BA6}
-		{BF0EC593-4BAB-424F-B7E9-BB13EC78A0E5} = {61C82014-E3A9-4AB3-8705-FBBD5F799BA6}
-		{C2A9982B-7BF7-4243-9E05-CFD31752B6DC} = {61C82014-E3A9-4AB3-8705-FBBD5F799BA6}
 		{E628BEDB-B51C-42ED-8E2B-FD8CA2A3BF3B} = {4B7E02CB-D58F-4326-A0A4-7AE70E47F8E3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution