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 location of assembly in nuget package #85

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix location of assembly in nuget package #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4cd906
Fix location of assembly in nuget package
ermshiperete Feb 2, 2018
ec363b7
Create signed/strong-named nuget package
ermshiperete Mar 2, 2020
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ Debug
*.zip
*.nupkg
*.lock.json
/packages/*
packages/
.idea/
6 changes: 3 additions & 3 deletions MarkdownDeep/MarkdownDeep.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>markdowndeep.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -87,6 +89,7 @@
</ItemGroup>
<ItemGroup>
<None Include="MarkdownDeep.nuspec" />
<None Include="markdowndeep.snk" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
Expand All @@ -106,9 +109,6 @@
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>if $(ConfigurationName) == Release NuGet.exe pack "$(ProjectDir)MarkdownDeep.nuspec" -o "$(SolutionDir)Output"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
8 changes: 4 additions & 4 deletions MarkdownDeep/MarkdownDeep.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>MarkdownDeep.NET</id>
<id>MarkdownDeep.NET.Patched</id>
<title>MarkdownDeep - .NET Only Edition</title>
<version>1.5</version>
<version>1.5.0.2</version>
<authors>Topten Software</authors>
<owners>Topten Software</owners>
<licenseUrl>http://www.toptensoftware.com/markdowndeep/license</licenseUrl>
Expand All @@ -19,7 +19,7 @@
<tags>Markdown MarkdownExtra MarkdownDeep</tags>
</metadata>
<files>
<file src="bin\Release\MarkdownDeep.dll" target="lib\.NetFramework 3.5" />
<file src="bin\Release\MarkdownDeep.pdb" target="lib\.NetFramework 3.5" />
<file src="bin\Release\MarkdownDeep.dll" target="lib\net35" />
<file src="bin\Release\MarkdownDeep.pdb" target="lib\net35" />
</files>
</package>
10 changes: 9 additions & 1 deletion MarkdownDeep/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,12 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.*")]
[assembly: InternalsVisibleTo("MarkdownDeepTests")]
[assembly: InternalsVisibleTo("MarkdownDeepTests, " +
"PublicKey=0024000004800000140100000602000000240000525341310008000001000100cf57a488bbd01a" +
"1135b1d3ce546732cceb001093e0188c442d13f8144c4f662b9966aaa10206e79186864cd57ea7" +
"a5e5641df89c46bcd0a53ef970a1acbc15b953940be33b47731dc2ace5d2ce3bea0920a7833ce4" +
"3f1b54419ab3918d76b2f8b47d3a1b31261ceffa1e136c1a88a91554808c36fbd68c2c09744c06" +
"ac22c17f7b0f36313f4ecfbf8f604840cc48562c0aa6647813b899adcdc075d0cd1343ddc5e60e" +
"baa6e85e69e691a872b5dbfb030940da941be138fd8caf2ff1929146bc5e5ca45fd9a3890a7c00" +
"da5b7d9e3fc0ea799f03afcd9aafaae92096bf3dadb25a6e727707b655491cd6764235e8f4fe38" +
"ed4b2c67fdd481d162ee1eb93296be")]
Binary file added MarkdownDeep/markdowndeep.snk
View file
Open in desktop
Binary file not shown.
17 changes: 11 additions & 6 deletions MarkdownDeepTests/MarkdownDeepTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\MarkdownDeep\markdowndeep.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -396,6 +398,9 @@
<EmbeddedResource Include="testfiles\spantests\Emphasis.txt" />
</ItemGroup>
<ItemGroup>
<None Include="..\MarkdownDeep\markdowndeep.snk">
<Link>markdowndeep.snk</Link>
</None>
<None Include="MarkdownDeepTests.dll.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -461,12 +466,12 @@
<EmbeddedResource Include="testfiles\safemode\Basic%28SafeMode%29.html" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PostBuildEvent>xcopy /D /Y "$(SolutionDir)MarkdownDeepJS\*.js" "$(ProjectDir)JSTestResources"</PostBuildEvent>
Expand Down