Skip to content

Commit

Permalink
Migrate to .NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
jbe2277 committed Nov 19, 2023
1 parent 13775ee commit 734d35b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private Dictionary<string, string> CreateDocComments()
var fileName = Path.GetFileName(originalPath);
string? path = null;
// TOOD: Bad design with hard-coded path. Required Roslyn API is internal.
foreach (var version in Enumerable.Range(0, 18).Select(x => $"7.0.{18-x}\\ref\\net7.0"))
foreach (var version in Enumerable.Range(0, 19).Select(x => $"8.0.{18-x}\\ref\\net8.0"))
{
path = GetNetFrameworkPathOrNull(fileName, version);
if (path != null) break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,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=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")));
references.Add(CreateReference(Assembly.Load("System.Runtime, Version=8.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)); }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<AssemblyName>Waf.DotNetPad.Applications</AssemblyName>
<RootNamespace>Waf.DotNetPad.Applications</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Waf.Wpf" Version="7.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.7.0" />
<PackageReference Include="System.Waf.Wpf" Version="7.0.1-alpha.0.51" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-3.final" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.8.0-3.final" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/DotNetPad/DotNetPad.Domain/DotNetPad.Domain.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>Waf.DotNetPad.Domain</AssemblyName>
<RootNamespace>Waf.DotNetPad.Domain</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Waf.Core" Version="7.0.0" />
<PackageReference Include="System.Waf.Core" Version="7.0.1-alpha.0.51" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
</ItemGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" PrivateAssets="all" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DotNetPad.Presentation\DotNetPad.Presentation.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<RootNamespace>Waf.DotNetPad.Presentation</RootNamespace>
<AssemblyName>DotNetPad</AssemblyName>
Expand Down

0 comments on commit 734d35b

Please sign in to comment.