Skip to content

Commit 3bd249a

Browse files
authored
Various package updates (dotnet#1573)
* update Microsoft.CodeAnalysis versions, clean up some unused props * update PowerShell to 7.1.4 * update ExtensionLab packages
1 parent 0b8b1b6 commit 3bd249a

File tree

6 files changed

+9
-32
lines changed

6 files changed

+9
-32
lines changed

Directory.Build.props

+2-8
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,16 @@
77
<PropertyGroup>
88
<!-- private repo, don't do source-link -->
99
<DeterministicSourcePaths>false</DeterministicSourcePaths>
10-
<EnableSourceLink>false</EnableSourceLink>
10+
<EnableSourceLink>true</EnableSourceLink>
1111

1212
<!-- NuGet: A stable release of a package should not have a prerelease dependency. -->
1313
<NoWarn>$(NoWarn);NU5104</NoWarn>
1414
<FSharpCoreIncludeDocFileInOutput Condition="'$(FSharpCoreIncludeDocFileInOutput)' == ''">true</FSharpCoreIncludeDocFileInOutput>
1515
</PropertyGroup>
1616

1717
<PropertyGroup>
18-
<!-- These properties are needed so that version number can be same for MLS.Agent.Tools and the libraries that depend on it -->
19-
<NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
20-
<PocketLoggerVersion>0.3.0</PocketLoggerVersion>
21-
<SystemDiagnosticsProcessVersion>4.3.0</SystemDiagnosticsProcessVersion>
2218
<SystemReactiveVersion>5.0.0</SystemReactiveVersion>
23-
<SystemRuntimeExtensionsVersion>4.3.0</SystemRuntimeExtensionsVersion>
24-
<MicrosoftCodeAnalysisCommonVersion>3.10.0</MicrosoftCodeAnalysisCommonVersion>
25-
<TaskExtensionsVersion>0.1.8580001</TaskExtensionsVersion>
19+
<MicrosoftCodeAnalysisCommonVersion>3.11.0</MicrosoftCodeAnalysisCommonVersion>
2620
</PropertyGroup>
2721

2822
<PropertyGroup>

eng/targets/NuGet.targets

-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
<ItemGroup>
44
<NuspecProperty Include="Configuration=$(Configuration)" />
55
<NuspecProperty Include="TargetFramework=$(TargetFramework)" />
6-
<!-- These properties are needed so that version number can be same for MLS.Agent.Tools and the libraries that depend on it -->
7-
<NuspecProperty Include="NewtonsoftJsonVersion=$(NewtonsoftJsonVersion)" />
8-
<NuspecProperty Include="PocketLoggerVersion=$(PocketLoggerVersion)" />
9-
<NuspecProperty Include="SystemDiagnosticsProcessVersion=$(SystemDiagnosticsProcessVersion)" />
10-
<NuspecProperty Include="MicrosoftCodeAnalysisCommonVersion=$(MicrosoftCodeAnalysisCommonVersion)" />
11-
<NuspecProperty Include="TaskExtensionsVersion=$(TaskExtensionsVersion)" />
12-
<NuspecProperty Include="SystemRuntimeExtensionsVersion=$(SystemRuntimeExtensionsVersion)" />
136
</ItemGroup>
147

158
</Project>

src/Microsoft.DotNet.Interactive.ExtensionLab/Microsoft.DotNet.Interactive.ExtensionLab.csproj

+2-12
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,11 @@
8484
</ItemGroup>
8585

8686
<ItemGroup>
87-
<PackageReference Include="Microsoft.Data.Analysis" Version="0.4.0" />
88-
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.0" />
89-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.8">
90-
<PrivateAssets>all</PrivateAssets>
91-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
92-
</PackageReference>
93-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" />
94-
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.1.8" />
95-
</ItemGroup>
96-
97-
<ItemGroup>
87+
<PackageReference Include="Microsoft.Data.Analysis" Version="0.18.0" />
88+
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.9" />
9889
<PackageReference Include="Iced" Version="1.8.0" />
9990
<PackageReference Include="ICSharpCode.Decompiler" Version="7.0.0.6225-preview1" />
10091
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonVersion)" />
101-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCommonVersion)" />
10292
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="1.1.132302" />
10393
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
10494
</ItemGroup>

src/Microsoft.DotNet.Interactive.PowerShell/Microsoft.DotNet.Interactive.PowerShell.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
<ItemGroup>
7878
<PackageReference Include="System.IO.Pipelines" Version="5.0.1" />
79-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.1.3" />
79+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.1.4" />
8080
</ItemGroup>
8181

8282
</Project>

src/Microsoft.DotNet.Interactive.SqlServer/Microsoft.DotNet.Interactive.SqlServer.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="Microsoft.SqlToolsService" Version="3.0.0-release.53" />
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" />
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.8">
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.9" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>

src/Microsoft.DotNet.Interactive.SqlServer/MsSqlKernelConnection.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ private async Task InitializeDbContextAsync(MsSqlConnectionOptions options, Kern
9696
context.Display($"Scaffolding a `DbContext` and initializing an instance of it called `{options.KernelName}` in the C# kernel.", "text/markdown");
9797

9898
var submission1 = @$"
99-
#r ""nuget:Microsoft.EntityFrameworkCore.Design,3.1.8""
100-
#r ""nuget:Microsoft.EntityFrameworkCore.SqlServer,3.1.8""
99+
#r ""nuget:Microsoft.EntityFrameworkCore.Design,5.0.9""
100+
#r ""nuget:Microsoft.EntityFrameworkCore.SqlServer,5.0.9""
101101
102102
using System;
103103
using System.Reflection;

0 commit comments

Comments
 (0)