From 2d6ffb5745897edc430e7f71630c0430b0275f14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:14:41 +0000
Subject: [PATCH] Bump dotnet-sdk from 8.0.111 to 9.0.101 (#272)

---
 .github/workflows/dotnet-desktop.yml   |  2 +-
 Directory.Build.props                  |  2 ++
 Repopulator/Repopulator.csproj         |  4 ----
 RepopulatorCli/RepopulatorCli.csproj   |  7 -------
 TemplateBuilder/Form1.cs               | 22 ++++++++++++----------
 TemplateBuilder/TemplateBuilder.csproj |  8 +-------
 Tests/Tests.csproj                     |  1 -
 global.json                            |  2 +-
 8 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index af85047..9378a2d 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -10,7 +10,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Install .NET 8 SDK
+    - name: Install .NET SDK
       uses: actions/setup-dotnet@v4
   
     - name: Build and test the application
diff --git a/Directory.Build.props b/Directory.Build.props
index 56b5b82..a0585ff 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,7 @@
 <Project>
   <PropertyGroup>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <TargetFramework>net9.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Repopulator/Repopulator.csproj b/Repopulator/Repopulator.csproj
index 366cb38..53ba8ff 100644
--- a/Repopulator/Repopulator.csproj
+++ b/Repopulator/Repopulator.csproj
@@ -1,15 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>3b0e5ac1-5439-470c-832d-7de566b22cd8</ProjectGuid>
-    <TargetFramework>net8.0</TargetFramework>
     <AssemblyTitle>Repopulator</AssemblyTitle>
     <Product>Repopulator</Product>
     <Copyright>Copyright ©  2019</Copyright>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
-  <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
   <ItemGroup>
     <Content Include="..\TemplateBuilder\NLog.config" Link="NLog.config" />
   </ItemGroup>
diff --git a/RepopulatorCli/RepopulatorCli.csproj b/RepopulatorCli/RepopulatorCli.csproj
index 4677970..83a5b41 100644
--- a/RepopulatorCli/RepopulatorCli.csproj
+++ b/RepopulatorCli/RepopulatorCli.csproj
@@ -1,28 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>RepopulatorCli</AssemblyName>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
-
   <ItemGroup>
     <None Remove="NLog.config" />
   </ItemGroup>
-
   <ItemGroup>
     <Content Include="NLog.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Repopulator\Repopulator.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/TemplateBuilder/Form1.cs b/TemplateBuilder/Form1.cs
index 166f85a..5827824 100644
--- a/TemplateBuilder/Form1.cs
+++ b/TemplateBuilder/Form1.cs
@@ -1,27 +1,28 @@
 using BrightIdeasSoftware;
-using FellowOakDicom;
-using DicomTypeTranslation;
+using DatabaseType = FAnsi.DatabaseType;
 using DicomTypeTranslation.TableCreation;
+using DicomTypeTranslation;
 using FAnsi.Discovery;
 using FAnsi.Implementation;
 using FAnsi.Implementations.MicrosoftSQL;
+using FAnsi.Implementations.MySql;
+using FAnsi.Implementations.Oracle;
+using FAnsi.Implementations.PostgreSql;
+using FellowOakDicom.Imaging;
+using FellowOakDicom;
 using ScintillaNET;
-using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using System.Text;
 using System.Windows.Forms;
-using FAnsi.Implementations.MySql;
-using FAnsi.Implementations.Oracle;
-using FAnsi.Implementations.PostgreSql;
+using System;
 using WeifenLuo.WinFormsUI.Docking;
-using DatabaseType = FAnsi.DatabaseType;
-using System.Runtime.InteropServices;
-using FellowOakDicom.Imaging;
-using System.Runtime.Versioning;
 
 namespace TemplateBuilder;
 
@@ -39,6 +40,7 @@ public partial class Form1 : Form
     readonly DockContent dcYaml = new() {HideOnClose = true};
     readonly DockContent dcTable = new() {HideOnClose = true};
 
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public Dictionary<DockContent,DockState> DefaultDockLocations { get; set; }
 
     public Form1()
diff --git a/TemplateBuilder/TemplateBuilder.csproj b/TemplateBuilder/TemplateBuilder.csproj
index 6a5071d..c5e5fe2 100644
--- a/TemplateBuilder/TemplateBuilder.csproj
+++ b/TemplateBuilder/TemplateBuilder.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
@@ -14,12 +14,6 @@
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
   <ItemGroup>
     <None Remove="NLog.config" />
   </ItemGroup>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index ddaaa37..7a0ce6a 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{66EED857-25C6-4FF9-967A-333CB151DF0B}</ProjectGuid>
-    <TargetFramework>net8.0</TargetFramework>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
diff --git a/global.json b/global.json
index 45bf809..45f790c 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.111",
+    "version": "9.0.101",
     "rollForward": "minor"
   }
 }