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

Jump to bottom

[fix] 使用同一个 csproj 减少维护成本 #47

Merged
merged 1 commit into from
Feb 11, 2023
Merged

[fix] 使用同一个 csproj 减少维护成本 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
# 编译整个项目
- name: Build the solution
run: |
move '.\Ink Canvas\Ink Canvas.csproj.actions' '.\Ink Canvas\Ink Canvas.csproj' -Force
msbuild -t:restore /p:GitFlow="Github Action"
msbuild /p:Configuration=Release /p:Platform="Any CPU" /p:GitFlow="Github Action"
env:
Expand Down
17 changes: 16 additions & 1 deletion Ink Canvas/Ink Canvas.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<Reference Include="IAWinFX">
<HintPath>.\IAWinFX.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.PowerPoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<Reference Condition=" '$(GitFlow)' == '' " Include="Microsoft.Office.Interop.PowerPoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>True</EmbedInteropTypes>
<HintPath>..\..\..\..\..\..\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.PowerPoint\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.PowerPoint.dll</HintPath>
Expand Down Expand Up @@ -247,6 +247,12 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition=" '$(GitFlow)' != '' " Include="Microsoft.Office.Interop.PowerPoint">
<Version>15.0.4420.1018</Version>
</PackageReference>
<PackageReference Condition=" '$(GitFlow)' != '' " Include="MicrosoftOfficeCore">
<Version>15.0.0</Version>
</PackageReference>
<PackageReference Include="ModernWpfUI">
<Version>0.9.4</Version>
</PackageReference>
Expand All @@ -273,6 +279,15 @@
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Condition=" '$(GitFlow)' != '' " Include="Microsoft.Office.Interop.PowerPoint">
<Guid>{91493440-5A91-11CF-8700-00AA0060263B}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>12</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
Expand Down
349 changes: 0 additions & 349 deletions Ink Canvas/Ink Canvas.csproj.actions
View file
Open in desktop

This file was deleted.