fix:issue #18
This commit is contained in:
+3
-1
@@ -1,7 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="UserContentModel">
|
<component name="UserContentModel">
|
||||||
<attachedFolders />
|
<attachedFolders>
|
||||||
|
<Path>../../ICC CE main</Path>
|
||||||
|
</attachedFolders>
|
||||||
<explicitIncludes />
|
<explicitIncludes />
|
||||||
<explicitExcludes />
|
<explicitExcludes />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
+105
-119
@@ -1,4 +1,4 @@
|
|||||||
using Ink_Canvas.Helpers;
|
using Ink_Canvas.Helpers;
|
||||||
using iNKORE.UI.WPF.Modern;
|
using iNKORE.UI.WPF.Modern;
|
||||||
using Microsoft.Office.Core;
|
using Microsoft.Office.Core;
|
||||||
using Microsoft.Office.Interop.PowerPoint;
|
using Microsoft.Office.Interop.PowerPoint;
|
||||||
@@ -29,11 +29,28 @@ namespace Ink_Canvas {
|
|||||||
|
|
||||||
private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
|
private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
|
||||||
try {
|
try {
|
||||||
pptApplication =
|
// 优先尝试获取 WPS 实例
|
||||||
(Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
|
if (Settings.PowerPointSettings.IsSupportWPS) {
|
||||||
|
try {
|
||||||
|
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("wpp.Application");
|
||||||
|
}
|
||||||
|
catch (COMException) {
|
||||||
|
pptApplication = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果 WPS 实例未获取到,尝试获取 PowerPoint 实例
|
||||||
|
if (pptApplication == null) {
|
||||||
|
try {
|
||||||
|
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
|
||||||
|
}
|
||||||
|
catch (COMException) {
|
||||||
|
pptApplication = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (pptApplication != null) {
|
if (pptApplication != null) {
|
||||||
//获得演示文稿对象
|
// 获得演示文稿对象
|
||||||
presentation = pptApplication.ActivePresentation;
|
presentation = pptApplication.ActivePresentation;
|
||||||
pptApplication.SlideShowBegin += PptApplication_SlideShowBegin;
|
pptApplication.SlideShowBegin += PptApplication_SlideShowBegin;
|
||||||
pptApplication.SlideShowNextSlide += PptApplication_SlideShowNextSlide;
|
pptApplication.SlideShowNextSlide += PptApplication_SlideShowNextSlide;
|
||||||
@@ -82,80 +99,48 @@ namespace Ink_Canvas {
|
|||||||
private static bool IsShowingAutoplaySlidesWindow = false;
|
private static bool IsShowingAutoplaySlidesWindow = false;
|
||||||
private bool isPowerPointInitialized = false;
|
private bool isPowerPointInitialized = false;
|
||||||
|
|
||||||
|
private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
|
||||||
|
|
||||||
private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e)
|
|
||||||
{
|
|
||||||
// 如果正在显示特定窗口,则跳过检查
|
// 如果正在显示特定窗口,则跳过检查
|
||||||
if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow)
|
if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
// 检查是否已有初始化的 PowerPoint 实例
|
// 检查是否已有初始化的 PowerPoint 实例
|
||||||
if (!isPowerPointInitialized)
|
if (!isPowerPointInitialized) {
|
||||||
{
|
// 优先尝试获取 WPS 实例
|
||||||
// 检查 WPS 进程(如果不支持则返回)
|
if (isWPSSupportOn) {
|
||||||
var wpsProcesses = Process.GetProcessesByName("wpp");
|
try {
|
||||||
if (wpsProcesses.Length > 0 && !isWPSSupportOn)
|
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("wpp.Application");
|
||||||
return;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (isWPSSupportOn && wpsProcesses.Length > 0)
|
|
||||||
{
|
|
||||||
// 优先获取WPS实例
|
|
||||||
try
|
|
||||||
{
|
|
||||||
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("wpp.Application");
|
|
||||||
}
|
|
||||||
catch (COMException)
|
|
||||||
{
|
|
||||||
// WPS未启动或未注册
|
|
||||||
pptApplication = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (pptApplication == null)
|
catch (COMException) {
|
||||||
{
|
pptApplication = null;
|
||||||
// 获取PowerPoint实例
|
|
||||||
try
|
|
||||||
{
|
|
||||||
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
|
|
||||||
}
|
|
||||||
catch (COMException)
|
|
||||||
{
|
|
||||||
pptApplication = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception)
|
|
||||||
{
|
// 如果 WPS 实例未获取到,尝试获取 PowerPoint 实例
|
||||||
pptApplication = null;
|
if (pptApplication == null) {
|
||||||
|
try {
|
||||||
|
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
|
||||||
|
}
|
||||||
|
catch (COMException) {
|
||||||
|
pptApplication = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果没有找到运行中的实例,则创建新实例
|
// 如果没有找到运行中的实例,则创建新实例
|
||||||
if (pptApplication == null)
|
if (pptApplication == null) {
|
||||||
{
|
try {
|
||||||
try
|
if (isWPSSupportOn) {
|
||||||
{
|
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
|
||||||
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
|
Type.GetTypeFromProgID("wpp.Application"));
|
||||||
Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
// 如果WPS支持开启,尝试创建WPS实例
|
|
||||||
if (isWPSSupportOn)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
|
|
||||||
Type.GetTypeFromProgID("wpp.Application"));
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
pptApplication = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
|
||||||
|
Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception) {
|
||||||
|
pptApplication = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
isPowerPointInitialized = true;
|
isPowerPointInitialized = true;
|
||||||
@@ -166,61 +151,50 @@ namespace Ink_Canvas {
|
|||||||
var pptProcesses = Process.GetProcessesByName("POWERPNT");
|
var pptProcesses = Process.GetProcessesByName("POWERPNT");
|
||||||
var wpsProcessesCheck = Process.GetProcessesByName("wpp");
|
var wpsProcessesCheck = Process.GetProcessesByName("wpp");
|
||||||
bool isWpsMode = isWPSSupportOn && wpsProcessesCheck.Length > 0;
|
bool isWpsMode = isWPSSupportOn && wpsProcessesCheck.Length > 0;
|
||||||
if ((isWpsMode && wpsProcessesCheck.Length == 0) || (!isWpsMode && pptProcesses.Length == 0))
|
if ((isWpsMode && wpsProcessesCheck.Length == 0) || (!isWpsMode && pptProcesses.Length == 0)) {
|
||||||
{
|
|
||||||
// 进程已关闭,清理对象
|
// 进程已关闭,清理对象
|
||||||
if (pptApplication != null)
|
if (pptApplication != null) {
|
||||||
{
|
|
||||||
try { Marshal.ReleaseComObject(pptApplication); } catch { }
|
try { Marshal.ReleaseComObject(pptApplication); } catch { }
|
||||||
pptApplication = null;
|
pptApplication = null;
|
||||||
}
|
}
|
||||||
if (presentation != null)
|
if (presentation != null) {
|
||||||
{
|
|
||||||
try { Marshal.ReleaseComObject(presentation); } catch { }
|
try { Marshal.ReleaseComObject(presentation); } catch { }
|
||||||
presentation = null;
|
presentation = null;
|
||||||
}
|
}
|
||||||
if (slides != null)
|
if (slides != null) {
|
||||||
{
|
|
||||||
try { Marshal.ReleaseComObject(slides); } catch { }
|
try { Marshal.ReleaseComObject(slides); } catch { }
|
||||||
slides = null;
|
slides = null;
|
||||||
}
|
}
|
||||||
slide = null;
|
slide = null;
|
||||||
isPowerPointInitialized = false;
|
isPowerPointInitialized = false;
|
||||||
// 这里可以选择自动重启 PowerPoint 或 WPS 或等待用户操作
|
// 这里可以选择自动重启 PowerPoint 或 WPS 或等待用户操作
|
||||||
try
|
try {
|
||||||
{
|
if (isWpsMode) {
|
||||||
if (isWpsMode)
|
// 自动重启 WPS
|
||||||
{
|
|
||||||
// 自动重启WPS
|
|
||||||
Process.Start("wpp.exe");
|
Process.Start("wpp.exe");
|
||||||
Thread.Sleep(2000); // 等待WPS启动
|
Thread.Sleep(2000); // 等待 WPS 启动
|
||||||
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
|
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
|
||||||
Type.GetTypeFromProgID("wpp.Application"));
|
Type.GetTypeFromProgID("wpp.Application"));
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
|
pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(
|
||||||
Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
|
Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
|
||||||
}
|
}
|
||||||
isPowerPointInitialized = true;
|
isPowerPointInitialized = true;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex) {
|
||||||
{
|
|
||||||
LogHelper.WriteLogToFile("PowerPoint/WPS 守护重启失败: " + ex.ToString(), LogHelper.LogType.Error);
|
LogHelper.WriteLogToFile("PowerPoint/WPS 守护重启失败: " + ex.ToString(), LogHelper.LogType.Error);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (pptApplication != null) {
|
if (pptApplication != null) {
|
||||||
// 检查是否有活动演示文稿
|
// 检查是否有活动演示文稿
|
||||||
if (pptApplication.Presentations.Count == 0 || pptApplication.ActivePresentation == null)
|
if (pptApplication.Presentations.Count == 0 || pptApplication.ActivePresentation == null)
|
||||||
return; // 退出方法,避免后续代码执行
|
return; // 退出方法,避免后续代码执行
|
||||||
isPowerPointInitialized = false;
|
isPowerPointInitialized = false;
|
||||||
timerCheckPPT.Stop();
|
timerCheckPPT.Stop();
|
||||||
//获得演示文稿对象
|
// 获得演示文稿对象
|
||||||
presentation = pptApplication.ActivePresentation;
|
presentation = pptApplication.ActivePresentation;
|
||||||
|
|
||||||
// 获得幻灯片对象集合
|
// 获得幻灯片对象集合
|
||||||
@@ -258,11 +232,13 @@ namespace Ink_Canvas {
|
|||||||
BtnPPTSlideShow.Visibility = Visibility.Collapsed;
|
BtnPPTSlideShow.Visibility = Visibility.Collapsed;
|
||||||
BtnPPTSlideShowEnd.Visibility = Visibility.Visible;
|
BtnPPTSlideShowEnd.Visibility = Visibility.Visible;
|
||||||
UpdatePPTBtnDisplaySettingsStatus();
|
UpdatePPTBtnDisplaySettingsStatus();
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
BtnPPTSlideShow.Visibility = Visibility.Visible;
|
BtnPPTSlideShow.Visibility = Visibility.Visible;
|
||||||
BtnPPTSlideShowEnd.Visibility = Visibility.Collapsed;
|
BtnPPTSlideShowEnd.Visibility = Visibility.Collapsed;
|
||||||
}
|
}
|
||||||
} catch (Exception ex) {
|
}
|
||||||
|
catch (Exception ex) {
|
||||||
LogHelper.WriteLogToFile("Failed to update button visibility: " + ex.ToString(), LogHelper.LogType.Error);
|
LogHelper.WriteLogToFile("Failed to update button visibility: " + ex.ToString(), LogHelper.LogType.Error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -275,8 +251,7 @@ namespace Ink_Canvas {
|
|||||||
PptApplication_PresentationOpen(null);
|
PptApplication_PresentationOpen(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 如果检测到已经开始放映,则立即进入画板模式
|
||||||
//如果检测到已经开始放映,则立即进入画板模式
|
|
||||||
if (pptApplication.SlideShowWindows.Count >= 1) {
|
if (pptApplication.SlideShowWindows.Count >= 1) {
|
||||||
Application.Current.Dispatcher.Invoke(() => {
|
Application.Current.Dispatcher.Invoke(() => {
|
||||||
PptApplication_SlideShowBegin(pptApplication.SlideShowWindows[1]);
|
PptApplication_SlideShowBegin(pptApplication.SlideShowWindows[1]);
|
||||||
@@ -1048,36 +1023,47 @@ namespace Ink_Canvas {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void BtnPPTSlideShowEnd_Click(object sender, RoutedEventArgs e) {
|
private void BtnPPTSlideShowEnd_Click(object sender, RoutedEventArgs e)
|
||||||
try {
|
{
|
||||||
Application.Current.Dispatcher.Invoke(() => {
|
try
|
||||||
try {
|
{
|
||||||
var ms = new MemoryStream();
|
// 检查 PowerPoint 进程是否还在运行
|
||||||
inkCanvas.Strokes.Save(ms);
|
var pptProcesses = Process.GetProcessesByName("POWERPNT");
|
||||||
ms.Position = 0;
|
var wpsProcessesCheck = Process.GetProcessesByName("wpp");
|
||||||
memoryStreams[pptApplication.SlideShowWindows[1].View.CurrentShowPosition] = ms;
|
bool isWpsMode = Settings.PowerPointSettings.IsSupportWPS && wpsProcessesCheck.Length > 0;
|
||||||
timeMachine.ClearStrokeHistory();
|
if ((isWpsMode && wpsProcessesCheck.Length == 0) || (!isWpsMode && pptProcesses.Length == 0))
|
||||||
}
|
{
|
||||||
catch (Exception ex) {
|
LogHelper.WriteLogToFile("PowerPoint/WPS 进程已关闭,无法结束幻灯片放映", LogHelper.LogType.Error);
|
||||||
LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
|
return;
|
||||||
}
|
}
|
||||||
});
|
|
||||||
|
|
||||||
new Thread(new ThreadStart(() => {
|
if (pptApplication != null && pptApplication.SlideShowWindows.Count >= 1)
|
||||||
try {
|
{
|
||||||
pptApplication.SlideShowWindows[1].View.Exit();
|
var slideShowWindow = pptApplication.SlideShowWindows[1];
|
||||||
}
|
var slideShowView = slideShowWindow.View;
|
||||||
catch (Exception ex) {
|
|
||||||
LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
|
|
||||||
}
|
|
||||||
})).Start();
|
|
||||||
|
|
||||||
HideSubPanels("cursor");
|
// 检查 SlideShowView 对象是否有效
|
||||||
await Task.Delay(150);
|
if (slideShowView != null)
|
||||||
ViewboxFloatingBarMarginAnimation(100, true);
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 尝试结束幻灯片放映
|
||||||
|
slideShowView.Exit();
|
||||||
|
}
|
||||||
|
catch (COMException ex)
|
||||||
|
{
|
||||||
|
LogHelper.WriteLogToFile($"结束幻灯片放映时发生 COM 异常: {ex.ToString()}", LogHelper.LogType.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LogHelper.WriteLogToFile("SlideShowView 对象无效,无法结束幻灯片放映", LogHelper.LogType.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex) {
|
catch (Exception ex)
|
||||||
LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
|
{
|
||||||
|
LogHelper.WriteLogToFile($"结束幻灯片放映时发生异常: {ex.ToString()}", LogHelper.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using Ink_Canvas.Helpers;
|
using Ink_Canvas.Helpers;
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
@@ -20,7 +20,7 @@ namespace Ink_Canvas {
|
|||||||
SaveInkCanvasStrokes(true, true);
|
SaveInkCanvasStrokes(true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SaveInkCanvasStrokes(bool newNotice = true, bool saveByUser = false) {
|
private void SaveInkCanvasStrokes(Boolean newNotice, Boolean saveByUser) {
|
||||||
try {
|
try {
|
||||||
var savePath = Settings.Automation.AutoSavedStrokesLocation
|
var savePath = Settings.Automation.AutoSavedStrokesLocation
|
||||||
+ (saveByUser ? @"\User Saved - " : @"\Auto Saved - ")
|
+ (saveByUser ? @"\User Saved - " : @"\Auto Saved - ")
|
||||||
@@ -33,8 +33,36 @@ namespace Ink_Canvas {
|
|||||||
else
|
else
|
||||||
//savePathWithName = savePath + @"\" + DateTime.Now.ToString("u").Replace(':', '-') + ".icstk";
|
//savePathWithName = savePath + @"\" + DateTime.Now.ToString("u").Replace(':', '-') + ".icstk";
|
||||||
savePathWithName = savePath + @"\" + DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss-fff") + ".icstk";
|
savePathWithName = savePath + @"\" + DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss-fff") + ".icstk";
|
||||||
var fs = new FileStream(savePathWithName, FileMode.Create);
|
|
||||||
inkCanvas.Strokes.Save(fs);
|
try {
|
||||||
|
using (FileStream fs = new FileStream(savePathWithName, FileMode.Create)) { // 修复未定义的filePath引用
|
||||||
|
inkCanvas.Strokes.Save(fs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex) when (ex is UnauthorizedAccessException || ex is DirectoryNotFoundException) {
|
||||||
|
var docPath = Path.Combine(
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
|
||||||
|
"Auto Saved - Annotation Strokes",
|
||||||
|
DateTime.Now.ToString("yyyyMMdd"),
|
||||||
|
Path.GetFileNameWithoutExtension(savePathWithName) + "_retry.icstk"); // 使用正确的原始文件名
|
||||||
|
|
||||||
|
try {
|
||||||
|
Directory.CreateDirectory(Path.GetDirectoryName(docPath));
|
||||||
|
using (FileStream fs = new FileStream(docPath, FileMode.Create)) {
|
||||||
|
inkCanvas.Strokes.Save(fs);
|
||||||
|
savePathWithName = docPath; // 更新通知使用的路径变量
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception fallbackEx) {
|
||||||
|
ShowNotification($"墨迹保存失败: {fallbackEx.Message}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex) {
|
||||||
|
ShowNotification($"墨迹保存失败: {ex.Message}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (newNotice) ShowNotification("墨迹成功保存至 " + savePathWithName);
|
if (newNotice) ShowNotification("墨迹成功保存至 " + savePathWithName);
|
||||||
}
|
}
|
||||||
catch (Exception ex) {
|
catch (Exception ex) {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Drawing.Imaging;
|
using System.Drawing.Imaging;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
|
|
||||||
namespace Ink_Canvas {
|
namespace Ink_Canvas {
|
||||||
@@ -35,17 +36,49 @@ namespace Ink_Canvas {
|
|||||||
using (var memoryGraphics = System.Drawing.Graphics.FromImage(bitmap)) {
|
using (var memoryGraphics = System.Drawing.Graphics.FromImage(bitmap)) {
|
||||||
memoryGraphics.CopyFromScreen(rc.X, rc.Y, 0, 0, rc.Size, System.Drawing.CopyPixelOperation.SourceCopy);
|
memoryGraphics.CopyFromScreen(rc.X, rc.Y, 0, 0, rc.Size, System.Drawing.CopyPixelOperation.SourceCopy);
|
||||||
|
|
||||||
// 确保目录存在
|
|
||||||
var directory = Path.GetDirectoryName(savePath);
|
var directory = Path.GetDirectoryName(savePath);
|
||||||
if (!Directory.Exists(directory)) {
|
if (!Directory.Exists(directory)) {
|
||||||
Directory.CreateDirectory(directory);
|
Directory.CreateDirectory(directory);
|
||||||
}
|
}
|
||||||
|
|
||||||
bitmap.Save(savePath, ImageFormat.Png);
|
try {
|
||||||
|
// 新增双重目录检查
|
||||||
|
Directory.CreateDirectory(directory); // 防止多线程场景下的竞争条件
|
||||||
|
bitmap.Save(savePath, ImageFormat.Png);
|
||||||
|
}
|
||||||
|
catch (Exception ex) when (ex is IOException ||
|
||||||
|
ex is UnauthorizedAccessException ||
|
||||||
|
ex is ExternalException) { // 新增GDI+异常捕获
|
||||||
|
// 改进备用路径处理
|
||||||
|
var docPath = Path.Combine(
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
|
||||||
|
"Auto Saved - Screenshots",
|
||||||
|
DateTime.Now.ToString("yyyyMMdd"),
|
||||||
|
Path.GetFileNameWithoutExtension(savePath) + "_retry.png"); // 添加重试后缀
|
||||||
|
|
||||||
|
try {
|
||||||
|
var docDir = Path.GetDirectoryName(docPath);
|
||||||
|
Directory.CreateDirectory(docDir);
|
||||||
|
bitmap.Save(docPath, ImageFormat.Png);
|
||||||
|
savePath = docPath;
|
||||||
|
}
|
||||||
|
catch (Exception fallbackEx) {
|
||||||
|
// 最终错误处理
|
||||||
|
if (!isHideNotification) {
|
||||||
|
ShowNotification($"截图保存失败: {fallbackEx.Message}");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isHideNotification) {
|
if (!isHideNotification) {
|
||||||
ShowNotification($"截图成功保存至 {savePath}");
|
try {
|
||||||
|
ShowNotification($"截图成功保存至 {savePath}");
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
// 防止通知系统自身异常导致崩溃
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,20 +90,39 @@ namespace Ink_Canvas {
|
|||||||
|
|
||||||
var basePath = Settings.Automation.AutoSavedStrokesLocation;
|
var basePath = Settings.Automation.AutoSavedStrokesLocation;
|
||||||
var dateFolder = DateTime.Now.ToString("yyyyMMdd");
|
var dateFolder = DateTime.Now.ToString("yyyyMMdd");
|
||||||
|
var fullPath = Path.Combine(
|
||||||
return Path.Combine(
|
|
||||||
basePath,
|
basePath,
|
||||||
"Auto Saved - Screenshots",
|
"Auto Saved - Screenshots",
|
||||||
dateFolder,
|
dateFolder);
|
||||||
$"{fileName}.png");
|
|
||||||
|
try {
|
||||||
|
if (!Directory.Exists(fullPath)) {
|
||||||
|
Directory.CreateDirectory(fullPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception) {
|
||||||
|
// 如果创建失败则使用文档目录
|
||||||
|
basePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
|
||||||
|
fullPath = Path.Combine(basePath, "Auto Saved - Screenshots", dateFolder);
|
||||||
|
Directory.CreateDirectory(fullPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Path.Combine(fullPath, $"{fileName}.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取默认文件夹路径
|
|
||||||
private string GetDefaultFolderPath() {
|
private string GetDefaultFolderPath() {
|
||||||
var basePath = Settings.Automation.AutoSavedStrokesLocation;
|
var basePath = Settings.Automation.AutoSavedStrokesLocation;
|
||||||
var screenshotsFolder = Path.Combine(basePath, "Auto Saved - Screenshots");
|
var screenshotsFolder = Path.Combine(basePath, "Auto Saved - Screenshots");
|
||||||
|
|
||||||
if (!Directory.Exists(screenshotsFolder)) {
|
try {
|
||||||
|
if (!Directory.Exists(screenshotsFolder)) {
|
||||||
|
Directory.CreateDirectory(screenshotsFolder);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception) {
|
||||||
|
// 如果创建失败则使用文档目录
|
||||||
|
basePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
|
||||||
|
screenshotsFolder = Path.Combine(basePath, "Auto Saved - Screenshots");
|
||||||
Directory.CreateDirectory(screenshotsFolder);
|
Directory.CreateDirectory(screenshotsFolder);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2F83C72861203F56E137DC704561E979347ABF79"
|
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2F83C72861203F56E137DC704561E979347ABF79"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2F83C72861203F56E137DC704561E979347ABF79"
|
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2F83C72861203F56E137DC704561E979347ABF79"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
is_global = true
|
is_global = true
|
||||||
build_property.RootNamespace = Ink_Canvas
|
build_property.RootNamespace = Ink_Canvas
|
||||||
build_property.ProjectDir = D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\
|
build_property.ProjectDir = E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\
|
||||||
build_property.EnableComHosting =
|
build_property.EnableComHosting =
|
||||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||||
build_property.CsWinRTUseWindowsUIXamlProjections = false
|
build_property.CsWinRTUseWindowsUIXamlProjections = false
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
|||||||
6bec4b6c35e0db47d20b56052b5c758a3faa3a06e85bf45a6282c814868af147
|
cfae595a93b6c81be8a910a33f627301d3c3cf05ca24ac0f4e2d65c6094a6d68
|
||||||
|
|||||||
@@ -334,3 +334,60 @@ D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClas
|
|||||||
D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanva.0F57E7D5.Up2Date
|
D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanva.0F57E7D5.Up2Date
|
||||||
D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe
|
D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe
|
||||||
D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe.config
|
D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe.config
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe.config
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\ICSharpCode.AvalonEdit.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Hardcodet.NotifyIcon.Wpf.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.Modern.Controls.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.Modern.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\MdXaml.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\MdXaml.Plugins.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Microsoft.Office.Interop.PowerPoint.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Office.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Newtonsoft.Json.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\NHotkey.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\NHotkey.Wpf.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\OSVersionExt.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\System.ValueTuple.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\IACore.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\IALoader.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\IAWinFX.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.AssemblyReference.cache
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Interop.IWshRuntimeLibrary.dll
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.ResolveComReference.cache
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\DrawShapeImageDictionary.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\IconImageDictionary.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\SeewoImageDictionary.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\Styles\Dark.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\Styles\Light.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\MainWindow.g.cs
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CountdownTimerWindow.g.cs
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CycleProcessBar.g.cs
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\HasNewUpdateWindow.g.cs
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\NamesInputWindow.g.cs
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\OperatingGuideWindow.g.cs
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\RandWindow.g.cs
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\YesOrNoNotificationWindow.g.cs
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\App.g.cs
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\GeneratedInternalTypeHelper.g.cs
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass_MarkupCompile.cache
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass_MarkupCompile.lref
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\App.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\MainWindow.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CountdownTimerWindow.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CycleProcessBar.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\HasNewUpdateWindow.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\NamesInputWindow.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\OperatingGuideWindow.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\RandWindow.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\YesOrNoNotificationWindow.baml
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.g.resources
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Ink_Canvas.Properties.Resources.resources
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.GenerateResource.cache
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.GeneratedMSBuildEditorConfig.editorconfig
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.CoreCompileInputs.cache
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.sourcelink.json
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanva.0F57E7D5.Up2Date
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe
|
||||||
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe.config
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -4,16 +4,16 @@
|
|||||||
winexe
|
winexe
|
||||||
C#
|
C#
|
||||||
.cs
|
.cs
|
||||||
D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\
|
||||||
Ink_Canvas
|
Ink_Canvas
|
||||||
none
|
none
|
||||||
false
|
false
|
||||||
TRACE;DEBUG;NETFRAMEWORK;NET472;;NET30_OR_GREATER;NET35_OR_GREATER;NET40_OR_GREATER;NET45_OR_GREATER;NET451_OR_GREATER;NET452_OR_GREATER;NET46_OR_GREATER;NET461_OR_GREATER;NET462_OR_GREATER;NET47_OR_GREATER;NET471_OR_GREATER;NET472_OR_GREATER
|
TRACE;DEBUG;NETFRAMEWORK;NET472;;NET30_OR_GREATER;NET35_OR_GREATER;NET40_OR_GREATER;NET45_OR_GREATER;NET451_OR_GREATER;NET452_OR_GREATER;NET46_OR_GREATER;NET461_OR_GREATER;NET462_OR_GREATER;NET47_OR_GREATER;NET471_OR_GREATER;NET472_OR_GREATER
|
||||||
D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\App.xaml
|
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml
|
||||||
13173459795
|
13173459795
|
||||||
|
|
||||||
56-1167124909
|
56-1167124909
|
||||||
46937853727
|
461490143614
|
||||||
MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\CountdownTimerWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
|
MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\CountdownTimerWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
|
||||||
|
|
||||||
False
|
False
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
|
|
||||||
FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\App.xaml;;
|
FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml;;
|
||||||
FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\MainWindow.xaml;;
|
FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\MainWindow.xaml;;
|
||||||
FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\CountdownTimerWindow.xaml;;
|
FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\CountdownTimerWindow.xaml;;
|
||||||
FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\CycleProcessBar.xaml;;
|
FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\CycleProcessBar.xaml;;
|
||||||
FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\HasNewUpdateWindow.xaml;;
|
FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\HasNewUpdateWindow.xaml;;
|
||||||
FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\NamesInputWindow.xaml;;
|
FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\NamesInputWindow.xaml;;
|
||||||
FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\OperatingGuideWindow.xaml;;
|
FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\OperatingGuideWindow.xaml;;
|
||||||
FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\RandWindow.xaml;;
|
FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\RandWindow.xaml;;
|
||||||
FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\YesOrNoNotificationWindow.xaml;;
|
FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\YesOrNoNotificationWindow.xaml;;
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7B34AAE1EC1DB9AB4585A1A4FEF656DB4C60F71"
|
#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A38C87817F8EDF2FE85AD10C301660AF08513462"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7B34AAE1EC1DB9AB4585A1A4FEF656DB4C60F71"
|
#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A38C87817F8EDF2FE85AD10C301660AF08513462"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\CountdownTimerWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "85F57BA392C75B7B6E1F2FA532105D03A2028A0E"
|
#pragma checksum "..\..\..\..\Windows\CountdownTimerWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "85F57BA392C75B7B6E1F2FA532105D03A2028A0E"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\CountdownTimerWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "85F57BA392C75B7B6E1F2FA532105D03A2028A0E"
|
#pragma checksum "..\..\..\..\Windows\CountdownTimerWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "85F57BA392C75B7B6E1F2FA532105D03A2028A0E"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\CycleProcessBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D130C26D74445B5E09CDAA42FEF4734A6D257250"
|
#pragma checksum "..\..\..\..\Windows\CycleProcessBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D130C26D74445B5E09CDAA42FEF4734A6D257250"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\CycleProcessBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D130C26D74445B5E09CDAA42FEF4734A6D257250"
|
#pragma checksum "..\..\..\..\Windows\CycleProcessBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D130C26D74445B5E09CDAA42FEF4734A6D257250"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\HasNewUpdateWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "237DE391CCBF9084C9908BFD5D5B61E01AF3B610"
|
#pragma checksum "..\..\..\..\Windows\HasNewUpdateWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "237DE391CCBF9084C9908BFD5D5B61E01AF3B610"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\HasNewUpdateWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "237DE391CCBF9084C9908BFD5D5B61E01AF3B610"
|
#pragma checksum "..\..\..\..\Windows\HasNewUpdateWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "237DE391CCBF9084C9908BFD5D5B61E01AF3B610"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\NamesInputWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9FEEA82AF23EB1521F5089E2975D1B2389373FF8"
|
#pragma checksum "..\..\..\..\Windows\NamesInputWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9FEEA82AF23EB1521F5089E2975D1B2389373FF8"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\NamesInputWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9FEEA82AF23EB1521F5089E2975D1B2389373FF8"
|
#pragma checksum "..\..\..\..\Windows\NamesInputWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9FEEA82AF23EB1521F5089E2975D1B2389373FF8"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\OperatingGuideWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "66D9A0A5E55C9B504151A1C0723C930C97D705DA"
|
#pragma checksum "..\..\..\..\Windows\OperatingGuideWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "66D9A0A5E55C9B504151A1C0723C930C97D705DA"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\OperatingGuideWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "66D9A0A5E55C9B504151A1C0723C930C97D705DA"
|
#pragma checksum "..\..\..\..\Windows\OperatingGuideWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "66D9A0A5E55C9B504151A1C0723C930C97D705DA"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "438AC48A5442919DB1E24FC876DEC488281105D7"
|
#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "438AC48A5442919DB1E24FC876DEC488281105D7"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "438AC48A5442919DB1E24FC876DEC488281105D7"
|
#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "438AC48A5442919DB1E24FC876DEC488281105D7"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\YesOrNoNotificationWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40DC779A3AC6B5F7F1D1CDBB7E7D7EEFD90FE7BB"
|
#pragma checksum "..\..\..\..\Windows\YesOrNoNotificationWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40DC779A3AC6B5F7F1D1CDBB7E7D7EEFD90FE7BB"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma checksum "..\..\..\..\Windows\YesOrNoNotificationWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40DC779A3AC6B5F7F1D1CDBB7E7D7EEFD90FE7BB"
|
#pragma checksum "..\..\..\..\Windows\YesOrNoNotificationWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40DC779A3AC6B5F7F1D1CDBB7E7D7EEFD90FE7BB"
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// 此代码由工具生成。
|
||||||
// Runtime Version:4.0.30319.42000
|
// 运行时版本:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// 对此文件的更改可能会导致不正确的行为,并且如果
|
||||||
// the code is regenerated.
|
// 重新生成代码,这些更改将会丢失。
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,23 +1,23 @@
|
|||||||
{
|
{
|
||||||
"format": 1,
|
"format": 1,
|
||||||
"restore": {
|
"restore": {
|
||||||
"D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj": {}
|
"E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj": {}
|
||||||
},
|
},
|
||||||
"projects": {
|
"projects": {
|
||||||
"D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj": {
|
"E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj": {
|
||||||
"version": "5.0.4",
|
"version": "5.0.4",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
|
"projectUniqueName": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
|
||||||
"projectName": "InkCanvasForClass",
|
"projectName": "InkCanvasForClass",
|
||||||
"projectPath": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
|
"projectPath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
|
||||||
"packagesPath": "C:\\Users\\Hydrogen\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
|
||||||
"outputPath": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\obj\\",
|
"outputPath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"fallbackFolders": [
|
"fallbackFolders": [
|
||||||
"D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
|
"E:\\Program Files\\Microsoft Visual Studio\\Shared\\NuGetPackages"
|
||||||
],
|
],
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"D:\\Hydrogen\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -5,12 +5,12 @@
|
|||||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
||||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
||||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Hydrogen\.nuget\packages\;D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
|
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;E:\Program Files\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
|
||||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
||||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion>
|
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||||
<SourceRoot Include="C:\Users\Hydrogen\.nuget\packages\" />
|
<SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
|
||||||
<SourceRoot Include="D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
|
<SourceRoot Include="E:\Program Files\Microsoft Visual Studio\Shared\NuGetPackages\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1119,23 +1119,23 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"packageFolders": {
|
"packageFolders": {
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\": {},
|
"C:\\Users\\Administrator\\.nuget\\packages\\": {},
|
||||||
"D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
|
"E:\\Program Files\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
|
||||||
},
|
},
|
||||||
"project": {
|
"project": {
|
||||||
"version": "5.0.4",
|
"version": "5.0.4",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
|
"projectUniqueName": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
|
||||||
"projectName": "InkCanvasForClass",
|
"projectName": "InkCanvasForClass",
|
||||||
"projectPath": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
|
"projectPath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
|
||||||
"packagesPath": "C:\\Users\\Hydrogen\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
|
||||||
"outputPath": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\obj\\",
|
"outputPath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"fallbackFolders": [
|
"fallbackFolders": [
|
||||||
"D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
|
"E:\\Program Files\\Microsoft Visual Studio\\Shared\\NuGetPackages"
|
||||||
],
|
],
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"D:\\Hydrogen\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,21 +1,21 @@
|
|||||||
{
|
{
|
||||||
"version": 2,
|
"version": 2,
|
||||||
"dgSpecHash": "FF5F4tAvbvA=",
|
"dgSpecHash": "asCIyEp3RNM=",
|
||||||
"success": true,
|
"success": true,
|
||||||
"projectFilePath": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
|
"projectFilePath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
|
||||||
"expectedPackageFiles": [
|
"expectedPackageFiles": [
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\avalonedit\\6.3.0.90\\avalonedit.6.3.0.90.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\avalonedit\\6.3.0.90\\avalonedit.6.3.0.90.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\hardcodet.notifyicon.wpf\\1.1.0\\hardcodet.notifyicon.wpf.1.1.0.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\hardcodet.notifyicon.wpf\\1.1.0\\hardcodet.notifyicon.wpf.1.1.0.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\inkore.ui.wpf.modern\\0.9.27\\inkore.ui.wpf.modern.0.9.27.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\inkore.ui.wpf.modern\\0.9.27\\inkore.ui.wpf.modern.0.9.27.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\mdxaml\\1.27.0\\mdxaml.1.27.0.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\mdxaml\\1.27.0\\mdxaml.1.27.0.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\mdxaml.plugins\\1.27.0\\mdxaml.plugins.1.27.0.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\mdxaml.plugins\\1.27.0\\mdxaml.plugins.1.27.0.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\microsoft.office.interop.powerpoint\\15.0.4420.1018\\microsoft.office.interop.powerpoint.15.0.4420.1018.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\microsoft.office.interop.powerpoint\\15.0.4420.1018\\microsoft.office.interop.powerpoint.15.0.4420.1018.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\microsoftofficecore\\15.0.0\\microsoftofficecore.15.0.0.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\microsoftofficecore\\15.0.0\\microsoftofficecore.15.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\nhotkey\\3.0.0\\nhotkey.3.0.0.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\nhotkey\\3.0.0\\nhotkey.3.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\nhotkey.wpf\\3.0.0\\nhotkey.wpf.3.0.0.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\nhotkey.wpf\\3.0.0\\nhotkey.wpf.3.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\osversionext\\3.0.0\\osversionext.3.0.0.nupkg.sha512",
|
"C:\\Users\\Administrator\\.nuget\\packages\\osversionext\\3.0.0\\osversionext.3.0.0.nupkg.sha512",
|
||||||
"C:\\Users\\Hydrogen\\.nuget\\packages\\system.valuetuple\\4.5.0\\system.valuetuple.4.5.0.nupkg.sha512"
|
"C:\\Users\\Administrator\\.nuget\\packages\\system.valuetuple\\4.5.0\\system.valuetuple.4.5.0.nupkg.sha512"
|
||||||
],
|
],
|
||||||
"logs": []
|
"logs": []
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user