a bit of cleanup and imrpovement of form errors

skartknet · Sep 27, 2024 · 4f281d8 · 4f281d8
1 parent 641da86
commit 4f281d8
Show file tree

Hide file tree

Showing 45 changed files with 460 additions and 1,630 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Our.Umbraco.Iconic - Release
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, v14 ]
 
 env:
   SOLUTION: Iconic.sln
@@ -12,13 +12,13 @@ env:
 
 jobs:
   publish-nuget:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
 
     - name: Get Release Version
       id: package_version
-      uses: KageKirin/get-csproj-version@v0.0.1
+      uses: KageKirin/get-csproj-version@v0
       with:
         file: ${{ env.PLUGIN_PROJECT }}
         regex: ^(?<major>0|[1-9]\d*)\.(?<minor>0|[1-9]\d*)\.(?<patch>0|[1-9]\d*)(?:-(?<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
@@ -34,17 +34,6 @@ jobs:
             echo ::set-output name=prerelease::false
         fi
     
-    - name: Setup .NET Core SDK 6.x
-      uses: actions/setup-dotnet@v3
-
-      with:
-        dotnet-version: 6.x
-
-    - name: Setup .NET Core SDK 7.x
-      uses: actions/setup-dotnet@v3
-
-      with:
-        dotnet-version: 7.x
 
     - name: Restore dependencies
       run: dotnet restore

diff --git a/Iconic.sln b/Iconic.sln
@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Our.Iconic", "Our.Iconic\Ou
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UmbracoV1402", "UmbracoV1402\UmbracoV1402.csproj", "{1490915C-ADEA-4612-88C8-D4DBE87C9601}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Our.Iconic.Web", "Our.Iconic.Web\Our.Iconic.Web.csproj", "{0C1CA0D3-B1D6-40A0-8B73-32498DD5D635}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,10 +27,6 @@ Global
 		{1490915C-ADEA-4612-88C8-D4DBE87C9601}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1490915C-ADEA-4612-88C8-D4DBE87C9601}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1490915C-ADEA-4612-88C8-D4DBE87C9601}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C1CA0D3-B1D6-40A0-8B73-32498DD5D635}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C1CA0D3-B1D6-40A0-8B73-32498DD5D635}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C1CA0D3-B1D6-40A0-8B73-32498DD5D635}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C1CA0D3-B1D6-40A0-8B73-32498DD5D635}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Our.Iconic.Web/HtmlExtensions.cs b/Our.Iconic.Web/HtmlExtensions.cs
diff --git a/Our.Iconic.Web/Our.Iconic.Web.csproj b/Our.Iconic.Web/Our.Iconic.Web.csproj
diff --git a/Our.Iconic/Our.Iconic.csproj b/Our.Iconic/Our.Iconic.csproj
@@ -23,27 +23,16 @@
 	<PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="src-old\**" />
+    <Content Remove="src-old\**" />
+    <EmbeddedResource Remove="src-old\**" />
+    <None Remove="src-old\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove="public\lang\en-US.xml" />
     <None Remove="public\lang\es-ES.xml" />
-    <None Remove="src-old\background.png" />
-    <None Remove="src-old\js\build\findPolyfill.min.js" />
-    <None Remove="src-old\js\src\iconic.controller.js" />
-    <None Remove="src-old\js\src\iconic.dialog.controller.js" />
-    <None Remove="src-old\js\src\iconic.directives.js" />
-    <None Remove="src-old\js\src\iconic.models.js" />
-    <None Remove="src-old\js\src\iconic.prevalues.controller.js" />
-    <None Remove="src-old\js\src\iconic.prevalues.editor.controller.js" />
-    <None Remove="src-old\lang\en-US.xml" />
-    <None Remove="src-old\lang\es-ES.xml" />
-    <None Remove="src-old\Styles\iconic.css" />
-    <None Remove="src-old\Styles\iconic.min.css" />
-    <None Remove="src-old\Styles\iconic.min.css.map" />
-    <None Remove="src-old\Styles\iconic.scss" />
-    <None Remove="src-old\Views\iconic.dialog.html" />
-    <None Remove="src-old\Views\iconic.edit.dialog.html" />
-    <None Remove="src-old\Views\iconic.html" />
-    <None Remove="src-old\Views\iconic.prevalues.html" />
   </ItemGroup>
 
   <ItemGroup>
@@ -55,78 +44,6 @@
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
     </Content>
-    <Content Include="src-old\background.png">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\js\build\findPolyfill.min.js">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\js\src\iconic.controller.js">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\js\src\iconic.dialog.controller.js">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\js\src\iconic.directives.js">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\js\src\iconic.models.js">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\js\src\iconic.prevalues.controller.js">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\js\src\iconic.prevalues.editor.controller.js">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\lang\en-US.xml">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\lang\es-ES.xml">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\Styles\iconic.css">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\Styles\iconic.min.css">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\Styles\iconic.min.css.map">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\Styles\iconic.scss">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\Views\iconic.dialog.html">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\Views\iconic.edit.dialog.html">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\Views\iconic.html">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-    <Content Include="src-old\Views\iconic.prevalues.html">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
   </ItemGroup>
 
 	<ItemGroup>
@@ -157,9 +74,6 @@
     <Content Update="public\preconfigs.json">
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
     </Content>
-    <Content Update="src-old\preconfigs.json">
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
   </ItemGroup>
 
   <ItemGroup>