Move template to separate dir (#258)

* moves template folder out of CPM folder * version bump 0.16+ * asp
Inxton · Nov 21, 2023 · 90e409f · 90e409f
1 parent 29de4aa
commit 90e409f
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 36 deletions.
diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+    "sdk": {
+      "version": "8.0.100"
+    }
+  }
+
diff --git a/templates/working/AXSharp.templates.csproj b/templates/working/AXSharp.templates.csproj
@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <PackageType>Template</PackageType>    
+    <TargetFramework>net8.0</TargetFramework>
+    <PackageType>Template</PackageType>
     <PackageId>AXSharp.templates</PackageId>
     <Title>AXSharp templates</Title>
     <Authors>PTKu</Authors>
     <Description>AXSharp project templates.</Description>
     <PackageTags>simatic-ax;axsharp;templates</PackageTags>
-
-
-
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <ContentTargetFolders>content</ContentTargetFolders>
@@ -20,20 +17,14 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/ix-ax/axsharp</RepositoryUrl>
   </PropertyGroup>
-
   <ItemGroup>
     <Content Include="templates\**\*" Exclude="templates\**\bin\**;templates\**\obj\**;templates\**\.apax\**" />
     <Compile Remove="**\*" />
   </ItemGroup>
-
   <ItemGroup>
-    <None Include="..\..\..\assets\icons\icon_128_128.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-    <None Include="..\..\NUGET-README.md">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>  
+    <Content Include="..\..\assets\icons\icon_128_128.png" Link="templates\icon_128_128.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\NUGET-README.md" Link="templates\NUGET-README.md" />
+  </ItemGroup>
 </Project>
diff --git a/templates/working/templates/axsharpblazor/.config/dotnet-tools.json b/templates/working/templates/axsharpblazor/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "AXSharp.ixc": {
-      "version": "0.14.0-alpha.74",
+      "version": "0.16.0-move-template-to-separate-dir.168",
       "commands": [
         "ixc"
       ]

diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-ixsharpblazor-hmi-ee3150da-5237-49bc-b265-f512331ded6c</UserSecretsId>
@@ -17,7 +17,7 @@
     <Content Include="Shared\Menu\ExpandableMenuItem.razor.css" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AXSharp.Presentation.Blazor.Controls" Version="0.14.0-alpha.74" />
+    <PackageReference Include="AXSharp.Presentation.Blazor.Controls" Version="0.16.0-move-template-to-separate-dir.168" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.2" />

diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.74" />
-    <PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.74" />
+    <PackageReference Include="AXSharp.Abstractions" Version="0.16.0-move-template-to-separate-dir.168" />
+    <PackageReference Include="AXSharp.Connector" Version="0.16.0-move-template-to-separate-dir.168" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include=".g\**" />

diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.74" />
-    <PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.74" />
-    <PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.14.0-alpha.74" />
+    <PackageReference Include="AXSharp.Abstractions" Version="0.16.0-move-template-to-separate-dir.168" />
+    <PackageReference Include="AXSharp.Connector" Version="0.16.0-move-template-to-separate-dir.168" />
+    <PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.16.0-move-template-to-separate-dir.168" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include=".g\**" />

diff --git a/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.74" />
-    <PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.74" />
+    <PackageReference Include="AXSharp.Abstractions" Version="0.16.0-move-template-to-separate-dir.168" />
+    <PackageReference Include="AXSharp.Connector" Version="0.16.0-move-template-to-separate-dir.168" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include=".g\**" />

diff --git a/templates/working/templates/axsharpconsole/.config/dotnet-tools.json b/templates/working/templates/axsharpconsole/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "AXSharp.ixc": {
-      "version": "0.14.0-alpha.74",
+      "version": "0.16.0-move-template-to-separate-dir.168",
       "commands": [
         "ixc"
       ]

diff --git a/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj b/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.74" />
-    <PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.74" />
-    <PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.14.0-alpha.74" />
+    <PackageReference Include="AXSharp.Abstractions" Version="0.16.0-move-template-to-separate-dir.168" />
+    <PackageReference Include="AXSharp.Connector" Version="0.16.0-move-template-to-separate-dir.168" />
+    <PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.16.0-move-template-to-separate-dir.168" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include=".g\**" />

diff --git a/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj b/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>