[DRAFT] Diz 3.0 rewrite - early pull request for comments / review

.github/workflows/dotnet.yml

@@ -1,12 +1,13 @@
-name: .NET Windows Desktop
+name: .NET 6 Win Desktop
 
-on: 
-- push
-- pull_request
+on: [ push, pull_request ]
 
 jobs:
+
   build:
+
     runs-on: windows-latest
+
     steps:
     - name: Inject slug/short variables
       uses: rlespinasse/github-slug-action@v3.x
@@ -21,24 +22,28 @@ jobs:
 
     - name: Print version
       run: echo "version ${{ steps.ver.outputs.ver }}"
-      
+
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
     - name: Setup dotnet
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
 
-    - name: Nuget (restore from cache)
-      uses: actions/cache@v1
-      id: cache
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-
-    - name: NuGet (Restore from scratch if needed)
-      if: steps.cache.outputs.cache-hit != 'true'
+# not currently working consistently, don't cache
+#    - name: Nuget (restore from cache)
+#      uses: actions/cache@v1
+#      id: cache
+#      with:
+#        path: ~/.nuget/packages
+#        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+#    
+#    - name: NuGet (Restore from scratch if needed)
+#      if: steps.cache.outputs.cache-hit != 'true'
+#      run: dotnet restore --locked-mode
+
+    - name: NuGet (Restore always from scratch)
       run: dotnet restore --locked-mode
 
     - name: Build
@@ -52,7 +57,7 @@ jobs:
 
     - uses: papeloto/action-zip@v1
       with:
-        files: DiztinGUIsh/bin/Release/net48/publish
+        files: DiztinGUIsh\bin\Release\net6.0-windows7.0\publish\
         dest: ${{ steps.ver.outputs.ver }}.zip
 
     - name: Upload Artifact

.gitignore

@@ -175,7 +175,7 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-# *.pubxml
+#*.pubxml # Diztinguish: we chose to do this.
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
@@ -337,3 +337,4 @@ ASALocalRun/
 
 # Local History for Visual Studio
 .localhistory/
+/MigrationBackup

Directory.Build.targets

@@ -0,0 +1,8 @@
+<Project>
+    <PropertyGroup>
+        <DefineConstants>$(DefineConstants);DIZ_3_BRANCH</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
+    </PropertyGroup>
+</Project>

Diz.Controllers/Diz.Controllers.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <GitThisAssemblyMetadata>true</GitThisAssemblyMetadata>
+        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+        <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+        <PackageVersion>3.0.0</PackageVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Diz.Core\Diz.Core.csproj" />
+      <ProjectReference Include="..\Diz.LogWriter\Diz.LogWriter.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="GitInfo">
+        <Version>2.2.0</Version>
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+    </ItemGroup>
+
+</Project>