Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.

SaveAs now changes the workbook title #501

Open
slodge wants to merge 2 commits into
base: 1.5-release
Choose a base branch
from
Open

SaveAs now changes the workbook title #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea9ba34
This made part of the VS build and run work...
slodge-work Nov 11, 2018
3e5a01c
Fix for SaveAs behaviour
slodge-work Nov 17, 2018
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
14 changes: 6 additions & 8 deletions Clients/Xamarin.Interactive.Client.Windows/Xamarin.Interactive.Client.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@
<PackageReference Include="MouseKeyboardActivityMonitor">
<Version>4.0.5150.10665</Version>
</PackageReference>
<PackageReference Include="WindowsAPICodePack-Core">
<Version>1.1.2</Version>
</PackageReference>
<PackageReference Include="WindowsAPICodePack-Shell">
<Version>1.1.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Page Include="App.xaml">
Expand Down Expand Up @@ -264,14 +270,6 @@
<Project>{0fd4b1dd-45a8-4f02-beb0-5881cd512573}</Project>
<Name>CommonMark.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\External\WindowsAPICodePack\Core\Core.csproj">
<Project>{2e1fb0df-f9bb-4909-9f32-2d9d022a8e57}</Project>
<Name>Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\External\WindowsAPICodePack\Shell\Shell.csproj">
<Project>{aa0c00cb-8699-4f37-bfae-40ca87acc06d}</Project>
<Name>Shell</Name>
</ProjectReference>
<ProjectReference Include="..\..\External\Xamarin.PropertyEditing\Xamarin.PropertyEditing.Windows\Xamarin.PropertyEditing.Windows.csproj">
<Project>{60af04be-1b6b-411b-bcba-c95eafbd7ac0}</Project>
<Name>Xamarin.PropertyEditing.Windows</Name>
Expand Down
2 changes: 1 addition & 1 deletion Clients/Xamarin.Interactive.Client/Workbook/Models/WorkbookPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ public void Save (IWorkbookSaveOperation operation)
LogicalPath = operation.Destination;
SaveOptions = WorkbookSaveOptions.None;

if (IndexPage != null && IndexPage.IsUntitled)
if (IndexPage != null)
IndexPage.Title = LogicalPath.NameWithoutExtension;

if (saveOperation.OnlyPage != null &&
Expand Down
17 changes: 9 additions & 8 deletions Package/Windows/AgentAppFiles.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,17 +300,18 @@
<Component Id="WpfAgentApp.System.Xml.XPath.XDocument.dll" Guid="54907165-7367-4BFB-AF25-88BBFE04AE0E">
<File Id="WpfAgentApp.System.Xml.XPath.XDocument.dll" Source="$(var.WpfAgentAppDirectory)\System.Xml.XPath.XDocument.dll" />
</Component>
<Component Id="WpfAgentApp.Microsoft.WindowsAPICodePack.dll" Guid="DC2BA773-3248-4AF3-ACE8-F9EB248A1A09">
<File Id="WpfAgentApp.Microsoft.WindowsAPICodePack.dll" Source="$(var.WpfAgentAppDirectory)\Microsoft.WindowsAPICodePack.dll" />
</Component>
</ComponentGroup>

<?ifdef AndroidSupport ?>
<?define AndroidAgentAppDirectory="..\..\_build\$(var.Configuration)\WorkbookApps\Android" ?>
<ComponentGroup Id="AndroidAgentAppComponents" Directory="AndroidAgentAppInstallFolder">
<Component Id="AndroidAgentApp.apk" Guid="6CD2D3A9-40D7-4583-BDD1-5B4711431381">
<File Id="AndroidAgentApp.apk" Source="$(var.AndroidAgentAppDirectory)\com.xamarin.workbook_app_android-Signed.apk" />
</Component>
</ComponentGroup>
<?define AndroidAgentAppDirectory="..\..\_build\$(var.Configuration)\WorkbookApps\Android" ?>
<ComponentGroup Id="AndroidAgentAppComponents" Directory="AndroidAgentAppInstallFolder">
<Component Id="AndroidAgentApp.apk" Guid="6CD2D3A9-40D7-4583-BDD1-5B4711431381">
<File Id="AndroidAgentApp.apk" Source="$(var.AndroidAgentAppDirectory)\com.xamarin.workbook_app_android-Signed.apk" />
</Component>
</ComponentGroup>
<?endif?>

<ComponentGroup Id="WorkbookManifestComponents" Directory="AgentAppInstallFolder">
<Component Id="workbookapps.json" Guid="47A8314B-0E4A-48BD-AA24-84A18AE06291">
<File Id="workbookapps.json" Source="..\..\_build\$(var.Configuration)\WorkbookApps\workbookapps.json" />
Expand Down
6 changes: 6 additions & 0 deletions Package/Windows/DotNetCoreAgentAppFiles-win-x86.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,12 @@
<Component Id="DNCAgentAppwinx86.System.Memory.dll" Guid="FDA9A09B-F94B-4509-BAB8-919511A724DF">
<File Id="DNCAgentAppwinx86.System.Memory.dll" Source="$(var.DotNetCoreAssembliesDir)\System.Memory.dll" />
</Component>
<Component Id="DNCAgentAppwinx86.mscordaccore_x86_x86_4.6.26515.07.dll" Guid="A79CC6CE-1A0A-4FCC-9EE9-B40A26274239">
<File Id="DNCAgentAppwinx86.mscordaccore_x86_x86_4.6.26515.07.dll" Source="$(var.DotNetCoreAssembliesDir)\mscordaccore_x86_x86_4.6.26515.07.dll" />
</Component>
<Component Id="DNCAgentAppwinx86.sos_x86_x86_4.6.26515.07.dll" Guid="B4810B78-BFF9-41CD-98FD-38674A4BB261">
<File Id="DNCAgentAppwinx86.sos_x86_x86_4.6.26515.07.dll" Source="$(var.DotNetCoreAssembliesDir)\sos_x86_x86_4.6.26515.07.dll" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
5 changes: 4 additions & 1 deletion WorkbookApps/Xamarin.Workbooks.Wpf/Xamarin.Workbooks.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
<PackageReference Include="System.ValueTuple">
<Version>4.4.0</Version>
</PackageReference>
<PackageReference Include="WindowsAPICodePack-Core">
<Version>1.1.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
Expand Down Expand Up @@ -121,4 +124,4 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="Build.targets" />
</Project>
</Project>