diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a8ecae..35bfe56 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,9 +40,8 @@ jobs: # 编译整个项目 - name: Build the solution run: | - move '.\Ink Canvas\Ink Canvas.csproj.actions' '.\Ink Canvas\Ink Canvas.csproj' -Force - msbuild -t:restore - msbuild /p:Configuration=Release /p:Platform="Any CPU" + msbuild -t:restore /p:GitFlow="Github Action" + msbuild /p:Configuration=Release /p:Platform="Any CPU" /p:GitFlow="Github Action" env: Configuration: ${{ matrix.configuration }} diff --git a/Ink Canvas/Ink Canvas.csproj b/Ink Canvas/Ink Canvas.csproj index 031adab..30d9125 100644 --- a/Ink Canvas/Ink Canvas.csproj +++ b/Ink Canvas/Ink Canvas.csproj @@ -244,6 +244,9 @@ 15.0.4420.1018 + + 15.0.0 + 0.9.4 @@ -261,7 +264,7 @@ False True - + {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} 2 8 diff --git a/Ink Canvas/Ink Canvas.csproj.actions b/Ink Canvas/Ink Canvas.csproj.actions deleted file mode 100644 index 1d4f961..0000000 --- a/Ink Canvas/Ink Canvas.csproj.actions +++ /dev/null @@ -1,348 +0,0 @@ - - - - - Debug - AnyCPU - {8D0EDFC7-F974-4571-BC49-6F3A6653FE81} - WinExe - Ink_Canvas - Ink Canvas - v4.7.2 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - true - - - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 2 - 2.0.2.%2a - false - false - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - Resources\InkCanvas.ico - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - 7.3 - prompt - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - 7.3 - prompt - true - - - app.manifest - - - - .\IACore.dll - - - .\IALoader.dll - - - .\IAWinFX.dll - - - - - False - AutoUpdater\OAUS.Core.dll - - - - - - - - - - - - - 4.0 - - - - - - - - - MSBuild:Compile - Designer - - - ChangeLogWindow.xaml - - - ClickSensitiveGrid.xaml - - - CycleProcessBar.xaml - - - - - - NamesInputWindow.xaml - - - RandWindow.xaml - - - RestoreHiddenSlidesWindow.xaml - - - - SettingsPage.xaml - - - CountdownTimerWindow.xaml - - - WelcomeWindow.xaml - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - PreserveNewest - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - 15.0.4420.1018 - - - 15.0.0 - - - 0.9.4 - - - 13.0.1 - - - - - {F935DC20-1CF0-11D0-ADB9-00C04FD58A0B} - 1 - 0 - 0 - tlbimp - False - True - - - {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} - 2 - 8 - 0 - primary - False - True - - - {91493440-5A91-11CF-8700-00AA0060263B} - 2 - 12 - 0 - primary - False - True - - - {00020430-0000-0000-C000-000000000046} - 2 - 0 - 0 - primary - False - True - - - {0002E157-0000-0000-C000-000000000046} - 5 - 3 - 0 - primary - False - True - - - - - - - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4.7.2 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - -