Skip to content

Commit

Permalink
Update to latest dependencies and WebView for stability.
Browse files Browse the repository at this point in the history
  • Loading branch information
RickStrahl committed Mar 15, 2023
1 parent 2978a74 commit 50af5c5
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 56 deletions.
107 changes: 54 additions & 53 deletions GistIntegrationAddin/GistIntegrationAddin.csproj
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<Version>0.13</Version>
<TargetFramework>net472</TargetFramework>
<!--<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>-->
<AssemblyName>GistIntegrationAddin</AssemblyName>
<UseWPF>true</UseWPF>
<Authors>Rick Strahl, West Wind Technologies</Authors>
<Product>Markdown Monster Gist Integration Addin</Product>
<Description>Allows creating or finding and selecting of Gists from the site, and embedding them into posts. You can also save documents as Gists.</Description>
<OutDir>$(AppData)\Markdown Monster\Addins\GistIntegration</OutDir>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.4.9">
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
<PackageReference Include="Westwind.Utilities" Version="3.1.8">
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
<PackageReference Include="FontAwesome.WPF" Version="4.7.0.9">
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1108.44">
<IncludeAssets>compile</IncludeAssets>
<PropertyGroup>
<Version>0.14</Version>
<TargetFramework>net472</TargetFramework>
<!--<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>-->
<AssemblyName>GistIntegrationAddin</AssemblyName>
<UseWPF>true</UseWPF>
<Authors>Rick Strahl, West Wind Technologies</Authors>
<Product>Markdown Monster Gist Integration Addin</Product>
<Description>Allows creating or finding and selecting of Gists from the site, and embedding them into posts. You can also save documents as Gists.</Description>
<OutDir>$(AppData)\Markdown Monster\Addins\GistIntegration</OutDir>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.4.9">
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
<PackageReference Include="Westwind.Utilities" Version="3.1.19">
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
<PackageReference Include="FontAwesome.WPF" Version="4.7.0.9">
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
</ItemGroup>
<PackageReference Include="Westwind.WebView" Version="0.1.2">
<IncludeAssets>compile</IncludeAssets>
</PackageReference>

</ItemGroup>

<!-- <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">-->
<!-- <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />-->
<!-- </ItemGroup>-->
<!-- <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">-->
<!-- <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.1" />-->
<!-- </ItemGroup>-->

<!-- This pulls in the reference and all dependencies - not what we want here-->
<!--<ItemGroup>
<!-- This pulls in the reference and all dependencies - not what we want here-->
<!--<ItemGroup>
<ProjectReference Include="..\..\MarkdownMonster\MarkdownMonster.csproj">
<Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
Expand All @@ -42,35 +43,35 @@



<ItemGroup Condition=" '$(TargetFramework)' == 'net472'">
<Reference Include="$(LocalAppData)\Markdown Monster\MarkdownMonster.exe">
<Private>false</Private>
</Reference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net472'">
<Reference Include="$(LocalAppData)\Markdown Monster\MarkdownMonster.exe">
<Private>false</Private>
</Reference>
</ItemGroup>



<ItemGroup>
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
</ItemGroup>


<ItemGroup>
<Resource Include="icon.png" />
<Resource Include="icon_22.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="icon.png" />
<Resource Include="icon_22.png" />
</ItemGroup>


<ItemGroup>
<None Update="version.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Update="version.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
<DefineConstants>NETCORE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472'">
<DefineConstants>NETFULL</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
<DefineConstants>NETCORE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472'">
<DefineConstants>NETFULL</DefineConstants>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions GistIntegrationAddin/version.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"summary": "Create and embed code snippets as Gists, and open from and save documents to Gists",
"description": "This addin allows you to take selected code in the editor, or code pasted from the clipboard and publish it as a Github Gist and embed it into the document.\r\n\r\nThe addin can also open and save documents (Markdown and code) from Gists.\r\n\r\n*** Important: In order to use this plug in and get the <script> link to render, you have to set the `EditorAllowRenderScriptTags: true` in the Markdown Monster settings. Without this setting the script tag won't render as script and Gists are not properly embedded.",
"releaseNotes": null,
"version": "0.13",
"minVersion": "2.3.15",
"version": "0.14",
"minVersion": "2.8.0",
"maxVersion": "2.99.99",
"author": "© Rick Strahl, West Wind Technologies",
"updated": "2022-02-16T12:30:00Z"
"updated": "2023-03-15T12:30:00Z"
}

0 comments on commit 50af5c5

Please sign in to comment.