Skip to content
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

Rename the netstandard2.0 package #2739

Merged
merged 5 commits into from
Feb 15, 2023
+25 −8
Merged

Rename the netstandard2.0 package #2739

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6cd0605
Rename the netstandard2.0 package.
shyamnamboodiripad Feb 14, 2023
a4000a5
Hide command window for child process.
shyamnamboodiripad Feb 14, 2023
2109bf6
Fix typo.
shyamnamboodiripad Feb 14, 2023
a98e446
Fix another typo.
shyamnamboodiripad Feb 14, 2023
abfe793
Fix publish script.
shyamnamboodiripad Feb 15, 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 dotnet-interactive.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactiv
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.PackageManagement", "src\Microsoft.DotNet.Interactive.PackageManagement\Microsoft.DotNet.Interactive.PackageManagement.csproj", "{53EF46D6-5E21-4507-B8C0-779B634262AA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.Netstandard20", "src\Microsoft.DotNet.Interactive.NetStandard20\Microsoft.DotNet.Interactive.Netstandard20.csproj", "{0FAA07B9-DBE4-47B5-939F-E1A69B975AD0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.VisualStudio", "src\Microsoft.DotNet.Interactive.VisualStudio\Microsoft.DotNet.Interactive.VisualStudio.csproj", "{0FAA07B9-DBE4-47B5-939F-E1A69B975AD0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.VSCode", "src\Microsoft.DotNet.Interactive.VSCode\Microsoft.DotNet.Interactive.VSCode.csproj", "{382C875B-2CB2-4F93-B5E9-EC14CDDB2256}"
EndProject
Expand Down
0 ...ctive.NetStandard20/Directory.Build.props → ...active.VisualStudio/Directory.Build.props
View file
Open in desktop
File renamed without changes.
0 ...teractive.Netstandard20.v3.ncrunchproject → ...teractive.Netstandard20.v3.ncrunchproject
View file
Open in desktop
File renamed without changes.
14 changes: 12 additions & 2 deletions ...t.DotNet.Interactive.Netstandard20.csproj → ...ft.DotNet.Interactive.VisualStudio.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,29 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Microsoft.DotNet.Interactive.Netstandard20</PackageId>
<PackageId>Microsoft.DotNet.Interactive.VisualStudio</PackageId>
<PackageDescription>Core types for building applications providing interactive programming for .NET. for the desktop</PackageDescription>
<PackageTags>interactive desktop</PackageTags>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)../Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj" />

<ItemGroup>
<ItemGroup Label="Core Functionality">
<Compile Include="$(MSBuildThisFileDirectory)../Microsoft.DotNet.Interactive/**/*.cs" />
<Compile Remove="$(MSBuildThisFileDirectory)../Microsoft.DotNet.Interactive/bin/**/*.cs" />
<Compile Remove="$(MSBuildThisFileDirectory)../Microsoft.DotNet.Interactive/obj/**/*.cs" />
</ItemGroup>

<ItemGroup Label="Helper Code">
<!-- StdIoKernelconnector et al. -->
<Compile Include="$(MSBuildThisFileDirectory)../dotnet-interactive/Connection/**/*.cs" />
</ItemGroup>

<ItemGroup Label="Resources">
<!-- JavaScript kernel -->
<EmbeddedResource Include="..\polyglot-notebooks\lib\polyglot-notebooks.js" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
<PackageReference Include="System.Memory" Version="4.5.5" />
Expand Down
9 changes: 7 additions & 2 deletions src/dotnet-interactive/Connection/StdIoKernelConnector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,13 @@ private void KillRemoteKernelProcess()
{
if (_process is { HasExited: false })
{
// todo: ensure killing process tree
_process?.Kill(true);
#if NETSTANDARD2_0
// TODO: Kill entrie process tree.
_process?.Kill();
shyamnamboodiripad marked this conversation as resolved.
Show resolved Hide resolved
#else
_process?.Kill(entireProcessTree: true);
#endif

_process?.Dispose();
_process = null;
}
Expand Down