Skip to content

Updated to Roslyn 4.8.0-3.final and .NET 8 stable packages/SDK #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filipw merged 3 commits into from
Nov 15, 2023
+9 −10
Merged

Updated to Roslyn 4.8.0-3.final and .NET 8 stable packages/SDK #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35fb1e5
updated to latest Roslyn 4.8.0-3.final
filipw Nov 14, 2023
9d199f1
use preview lang version in interactive runner
filipw Nov 14, 2023
35d023e
updated to .NET 8 stable
filipw Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100-rc.2.23502.2",
"version": "8.0.100",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<ItemGroup>
<PackageReference Include="Gapotchenko.FX" Version="2022.2.7" />
<PackageReference Include="Gapotchenko.FX.Reflection.Loader" Version="2022.2.7" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.4.0-1.final" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0-3.final" />
<PackageReference Include="ReadLine" Version="2.0.1" />
<PackageReference Include="StrongNamer" Version="0.2.5" PrivateAssets="all" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Dotnet.Script.Core/Interactive/InteractiveRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class InteractiveRunner
protected ScriptCompiler ScriptCompiler;
protected ScriptConsole Console;
private readonly string[] _packageSources;
protected CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Latest, kind: SourceCodeKind.Script);
protected CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Preview, kind: SourceCodeKind.Script);
protected InteractiveCommandProvider InteractiveCommandParser = new InteractiveCommandProvider();
protected string CurrentDirectory = Directory.GetCurrentDirectory();

Expand Down
2 changes: 1 addition & 1 deletion src/Dotnet.Script.Core/ScriptPublisher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Dotnet.Script.Core
{
public class ScriptPublisher
{
private const string ScriptingVersion = "4.4.0-1.final";
private const string ScriptingVersion = "4.8.0-3.final";

private readonly ScriptProjectProvider _scriptProjectProvider;
private readonly ScriptEmitter _scriptEmitter;
Expand Down
2 changes: 1 addition & 1 deletion src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<Compile Include="..\Dotnet.Script.DependencyModel\ProjectSystem\ScriptParserInternal.cs" Link="ScriptParserInternal.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.4.0-1.final" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0-3.final" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.4.0-1.final" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0-3.final" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion src/Dotnet.Script.Tests/TestFixtures/WebApi/WebApi.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#r "sdk:Microsoft.NET.Sdk.Web"
#r "nuget:Microsoft.Extensions.DependencyInjection.Abstractions, 8.0.0-rc.2.23479.6"

using Microsoft.AspNetCore.Builder;

Expand Down
4 changes: 2 additions & 2 deletions src/Dotnet.Script/Dotnet.Script.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-1.final" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.final" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0"
Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'"/>

<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.2.23479.6"
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0"
Condition="'$(TargetFramework)' == 'net8.0'"/>
</ItemGroup>
<ItemGroup>
Expand Down