Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[fix] 修复开发环境无法编译的问题 #48

Merged
merged 2 commits into from
Feb 12, 2023
Merged

[fix] 修复开发环境无法编译的问题 #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1d32da
[fix] 修复开发环境无法编译的问题
kengwang Feb 11, 2023
861388f
[fix] 优化逻辑
kengwang Feb 12, 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
28 changes: 16 additions & 12 deletions Ink Canvas/Ink Canvas.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,25 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition=" '$(GitFlow)' != '' " Include="Microsoft.Office.Interop.PowerPoint">
<!-- When Office is not installed -->
<ItemGroup Condition=" '$(GitFlow)' != '' ">
<PackageReference Include="Microsoft.Office.Interop.PowerPoint">
<Version>15.0.4420.1018</Version>
</PackageReference>
<PackageReference Condition=" '$(GitFlow)' != '' " Include="MicrosoftOfficeCore">
<PackageReference Include="MicrosoftOfficeCore">
<Version>15.0.0</Version>
</PackageReference>
<COMReference 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>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ModernWpfUI">
<Version>0.9.4</Version>
</PackageReference>
Expand All @@ -265,15 +277,7 @@
<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