Migrate to .NET7; create x64 and ARM64 packages

jbe2277 · Nov 26, 2022 · b47e211 · b47e211
1 parent 5cd763d
commit b47e211
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 23 deletions.
diff --git a/src/DotNetPad/Directory.Build.props b/src/DotNetPad/Directory.Build.props
@@ -3,7 +3,7 @@
     <Product>Waf DotNetPad</Product>
     <Company>Waf</Company>
     <Copyright>Copyright © 2016-2022 jbe2277</Copyright>
-    <Version>6.1.1.100</Version>
+    <Version>7.0.0.100</Version>
     <NeutralLanguage>en-US</NeutralLanguage>
 
     <Nullable>enable</Nullable>

diff --git a/src/DotNetPad/DotNetPad.Applications/CodeAnalysis/ScriptingWorkspace.cs b/src/DotNetPad/DotNetPad.Applications/CodeAnalysis/ScriptingWorkspace.cs
@@ -61,7 +61,7 @@ public DocumentId AddProjectWithDocument(string documentFileName, string text)
         var projectId = ProjectId.CreateNewId();
 
         var references = defaultReferences.Distinct().Select(CreateReference).ToList();
-        references.Add(CreateReference(Assembly.Load("System.Runtime, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")));
+        references.Add(CreateReference(Assembly.Load("System.Runtime, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")));
         if (language == LanguageNames.VisualBasic) { references.Add(CreateReference(typeof(VBMath).Assembly)); }
         else if (language == LanguageNames.CSharp) { references.Add(CreateReference(typeof(RuntimeBinderException).Assembly)); }
 

diff --git a/src/DotNetPad/DotNetPad.Applications/DotNetPad.Applications.csproj b/src/DotNetPad/DotNetPad.Applications/DotNetPad.Applications.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <AssemblyName>Waf.DotNetPad.Applications</AssemblyName>
     <RootNamespace>Waf.DotNetPad.Applications</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="System.Waf.Wpf" Version="6.4.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.2.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.2.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.4.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/DotNetPad/DotNetPad.Domain/DotNetPad.Domain.csproj b/src/DotNetPad/DotNetPad.Domain/DotNetPad.Domain.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>Waf.DotNetPad.Domain</AssemblyName>
     <RootNamespace>Waf.DotNetPad.Domain</RootNamespace>
   </PropertyGroup>

diff --git a/src/DotNetPad/DotNetPad.Packaging/DotNetPad.Packaging.wapproj b/src/DotNetPad/DotNetPad.Packaging/DotNetPad.Packaging.wapproj
@@ -61,7 +61,7 @@
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>False</GenerateTestArtifacts>
-    <AppxBundlePlatforms>neutral</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x64|arm64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -155,7 +155,7 @@
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DotNetPad.Presentation\DotNetPad.Presentation.csproj" />

diff --git a/src/DotNetPad/DotNetPad.Packaging/Package.appxmanifest b/src/DotNetPad/DotNetPad.Packaging/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="50628JuergenBerchtel.WafDotNetPad"
     Publisher="CN=3C8CBF61-934D-4358-AA07-F08013E88454"
-    Version="6.1.1.0" />
+    Version="7.0.0.0" />
 
   <Properties>
     <DisplayName>Waf DotNetPad</DisplayName>

diff --git a/src/DotNetPad/DotNetPad.Presentation/Controls/CodeEditor.cs b/src/DotNetPad/DotNetPad.Presentation/Controls/CodeEditor.cs
@@ -95,10 +95,11 @@ private async Task ShowCompletionAsync(char? triggerChar)
             if (completionWindow == null && (triggerChar == null || triggerChar == '.' || IsAllowedLanguageLetter(triggerChar.Value)))
             {
                 var position = CaretOffset;
-                var word = GetWord(position);
+                var (wordStart, text) = GetWord(position);
 
                 var document = WorkspaceService.GetDocument(DocumentFile);
                 var completionService = CompletionService.GetService(document);
+                if (completionService is null) return;
 
                 var completionList = await Task.Run(async () => await completionService.GetCompletionsAsync(document, position, cancellationToken: cancellationToken), cancellationToken);
                 if (completionList == null) return;
@@ -114,16 +115,16 @@ private async Task ShowCompletionAsync(char? triggerChar)
                     };
                     completionWindow.MaxWidth = completionWindow.Width = 340;
                     completionWindow.MaxHeight = completionWindow.Height = 206;
-                    foreach (var completionItem in completionList.Items)
+                    foreach (var completionItem in completionList.ItemsList)
                     {
                         completionWindow.CompletionList.CompletionData.Add(new CodeCompletionData(completionItem.DisplayText,
                             () => GetDescriptionAsync(completionService, document, completionItem), completionItem.Tags));
                     }
 
                     if (triggerChar == null || IsAllowedLanguageLetter(triggerChar.Value))
                     {
-                        completionWindow.StartOffset = word.wordStart;
-                        completionWindow.CompletionList.SelectItem(word.text);
+                        completionWindow.StartOffset = wordStart;
+                        completionWindow.CompletionList.SelectItem(text);
                     }
                     completionWindow.Show();
                     completionWindow.Closed += (s2, e2) => completionWindow = null;
@@ -135,7 +136,7 @@ private async Task ShowCompletionAsync(char? triggerChar)
 
     private static async Task<ImmutableArray<TaggedText>> GetDescriptionAsync(CompletionService completionService, Document document, CompletionItem completionItem)
     {
-        return (await Task.Run(async () => await completionService.GetDescriptionAsync(document, completionItem))).TaggedParts;
+        return (await Task.Run(async () => await completionService.GetDescriptionAsync(document, completionItem)))?.TaggedParts ?? default;
     }
 
     private (int wordStart, string text) GetWord(int position)

diff --git a/src/DotNetPad/DotNetPad.Presentation/DotNetPad.Presentation.csproj b/src/DotNetPad/DotNetPad.Presentation/DotNetPad.Presentation.csproj
@@ -1,12 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <RootNamespace>Waf.DotNetPad.Presentation</RootNamespace>
     <AssemblyName>DotNetPad</AssemblyName>
     <AssemblyTitle>Waf DotNetPad</AssemblyTitle>
     <ApplicationIcon>Resources\Images\DotNetPad.ico</ApplicationIcon>
+    <Platforms>AnyCPU;x64;ARM64</Platforms>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Platform)' == 'x64' ">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'ARM64' ">
+    <PlatformTarget>ARM64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/DotNetPad/DotNetPad.sln b/src/DotNetPad/DotNetPad.sln
@@ -76,20 +76,20 @@ Global
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|ARM.Build.0 = Debug|Any CPU
-		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|x64.Build.0 = Debug|Any CPU
+		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|ARM64.Build.0 = Debug|ARM64
+		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|x64.ActiveCfg = Debug|x64
+		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|x64.Build.0 = Debug|x64
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Debug|x86.Build.0 = Debug|Any CPU
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|Any CPU.Build.0 = Release|Any CPU
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|ARM.ActiveCfg = Release|Any CPU
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|ARM.Build.0 = Release|Any CPU
-		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|ARM64.Build.0 = Release|Any CPU
-		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|x64.ActiveCfg = Release|Any CPU
-		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|x64.Build.0 = Release|Any CPU
+		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|ARM64.ActiveCfg = Release|ARM64
+		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|ARM64.Build.0 = Release|ARM64
+		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|x64.ActiveCfg = Release|x64
+		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|x64.Build.0 = Release|x64
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|x86.ActiveCfg = Release|Any CPU
 		{27BC0A1B-0E66-4F47-B6D1-A6EDE5211184}.Release|x86.Build.0 = Release|Any CPU
 		{45949512-174B-4A6B-ABFE-A9BAF241057C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU