Basic UI

.github/workflows/ci.yaml

@@ -8,27 +8,49 @@ on:
       - main
 jobs:
   build:
+    strategy:
+      matrix:
+        configuration: [Release]
+        platform: [x64]
     runs-on: windows-latest
     permissions:
       packages: read
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: '6.0.x'
-      - if: ${{ github.ref == 'refs/heads/main' }}
-        run: |
-          dotnet nuget add source --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/OpenSimTools/index.json"
-          dotnet publish -c Release
-      - if: ${{ github.ref == 'refs/heads/main' }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: AMS2CM
-          path: src/CLI/bin/Release/net6.0-windows/publish/**
-          if-no-files-found: error
-      - if: ${{ github.ref == 'refs/heads/main' }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: AMS2CM
-          path: LICENSE
-          if-no-files-found: error
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+    - name: Setup MSBuild
+      uses: microsoft/setup-msbuild@v1.0.2
+    - name: Configure NuGet repository
+      run: dotnet nuget add source --username USERNAME --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/OpenSimTools/index.json"
+
+    - name: Build
+      run: |
+        msbuild /t:Restore /p:Configuration=${{ matrix.configuration }}
+        msbuild /t:Publish /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
+
+    - name: Upload license
+      uses: actions/upload-artifact@v3
+      with:
+        name: AMS2CM
+        path: LICENSE
+        if-no-files-found: error
+    - name: Upload CLI
+      uses: actions/upload-artifact@v3
+      with:
+        name: AMS2CM
+        path: src/CLI/bin/${{ matrix.configuration }}/net6.0-windows/publish/**
+        if-no-files-found: error
+    # Separate package until stable, to be able to release CLI independently
+    - name: Upload GUI
+      uses: actions/upload-artifact@v3
+      with:
+        name: AMS2CM GUI
+        path: src/GUI/bin/${{ matrix.platform }}/${{ matrix.configuration }}/net6.0-windows10.0.19041.0/**
+        if-no-files-found: error

AMS2CM.sln

@@ -1,22 +1,87 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CLI", "src\CLI\CLI.csproj", "{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}"
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33530.505
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CLI", "src\CLI\CLI.csproj", "{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\Core\Core.csproj", "{A20048F0-D212-499D-8CCF-5E0B989E21F7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{A20048F0-D212-499D-8CCF-5E0B989E21F7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GUI", "src\GUI\GUI.csproj", "{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Debug|x64.Build.0 = Debug|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Debug|x86.Build.0 = Debug|Any CPU
 		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Release|ARM64.Build.0 = Release|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Release|x64.ActiveCfg = Release|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Release|x64.Build.0 = Release|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Release|x86.ActiveCfg = Release|Any CPU
+		{77400FE1-383E-4D92-9A7F-D4AEA8A1AE0C}.Release|x86.Build.0 = Release|Any CPU
 		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Debug|x64.Build.0 = Debug|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Debug|x86.Build.0 = Debug|Any CPU
 		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Release|ARM64.Build.0 = Release|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Release|x64.ActiveCfg = Release|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Release|x64.Build.0 = Release|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Release|x86.ActiveCfg = Release|Any CPU
+		{A20048F0-D212-499D-8CCF-5E0B989E21F7}.Release|x86.Build.0 = Release|Any CPU
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|Any CPU.Build.0 = Debug|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|Any CPU.Deploy.0 = Debug|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|x64.ActiveCfg = Debug|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|x64.Build.0 = Debug|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|x64.Deploy.0 = Debug|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|x86.ActiveCfg = Debug|x86
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|x86.Build.0 = Debug|x86
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Debug|x86.Deploy.0 = Debug|x86
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|Any CPU.ActiveCfg = Release|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|Any CPU.Build.0 = Release|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|Any CPU.Deploy.0 = Release|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|ARM64.Build.0 = Release|ARM64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|ARM64.Deploy.0 = Release|ARM64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|x64.ActiveCfg = Release|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|x64.Build.0 = Release|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|x64.Deploy.0 = Release|x64
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|x86.ActiveCfg = Release|x86
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|x86.Build.0 = Release|x86
+		{2C96062E-2EDF-4BBE-8BC2-968B7A1F4EFE}.Release|x86.Deploy.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6C69475D-BCFD-4B42-A90D-845A72BFB1F8}
 	EndGlobalSection
 EndGlobal

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2023 OpenSimTools Contributors
+Copyright (c) 2023 Open Sim Tools
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/CLI/CLI.csproj

@@ -1,31 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net6.0-windows</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<Company>OpenSimTools</Company>
+		<Authors>OpenSimTools Contributors</Authors>
+		<AssemblyName>AMS2CM</AssemblyName>
+		<RootNamespace>AMS2CM.CLI</RootNamespace>
+		<ApplicationIcon>..\Shared\AMS2CM.ico</ApplicationIcon>
+	</PropertyGroup>
 
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0-windows</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <Company>OpenSimTools</Company>
-        <Authors>OpenSimTools Contributors</Authors>
-        <AssemblyName>AMS2CM</AssemblyName>
-        <RootNamespace>AMS2CM.CLI</RootNamespace>
-        <ApplicationIcon>AMS2CM.ico</ApplicationIcon>
-    </PropertyGroup>
-
-    <ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
-		<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.0.0" />
-    </ItemGroup>
-
-    <ItemGroup>
+	<ItemGroup>
 		<ProjectReference Include="..\Core\Core.csproj" />
-    </ItemGroup>
+	</ItemGroup>
 
 	<ItemGroup>
-		<Content Include="Config.yaml">
+		<Content Include="..\Shared\Config.yaml">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>
-
 </Project>

src/Core/Core.csproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
         <TargetFramework>net6.0-windows</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -17,4 +16,9 @@
         <PackageReference Include="SevenZipExtractor" Version="1.0.17" />
     </ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
+		<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.0.0" />
+	</ItemGroup>
 </Project>