Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move template to separate dir #258

Merged
merged 4 commits into from
Nov 21, 2023
Merged

Move template to separate dir #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24ffea9
moves template folder out of CPM folder
PTKu Nov 21, 2023
15bf6ea
version bump 0.16+
PTKu Nov 21, 2023
68a3bf3
asp
PTKu Nov 21, 2023
84d308d
asp merge
PTKu Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "8.0.100"
}
}

25 changes: 8 additions & 17 deletions templates/working/AXSharp.templates.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
2 changes: 1 addition & 1 deletion templates/working/templates/axsharpblazor/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
4 changes: 2 additions & 2 deletions templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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" />
Expand Down
6 changes: 3 additions & 3 deletions templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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\**" />
Expand Down
8 changes: 4 additions & 4 deletions templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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\**" />
Expand Down
6 changes: 3 additions & 3 deletions templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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\**" />
Expand Down
2 changes: 1 addition & 1 deletion templates/working/templates/axsharpconsole/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
8 changes: 4 additions & 4 deletions templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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\**" />
Expand Down
2 changes: 1 addition & 1 deletion templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>

<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down