Skip to content

Commit

Permalink
Fixing up NuGet packaging.
Browse files Browse the repository at this point in the history
  • Loading branch information
ipointer-certifid committed May 15, 2020
1 parent 41c6cf4 commit 199299b
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 8 deletions.
3 changes: 2 additions & 1 deletion AppVeyor.proj
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@
<XU_EXCLUDE Condition="'$(XU_EXCLUDE)' == ''">-notrait Category=Unit-Exclude</XU_EXCLUDE>
<XU_COMMAND Condition="'$(XU_COMMAND)' == ''">$(XU_RUNNER) $(TESTS_DLLS) $(XU_EXCLUDE) -xml "@(XU_RESULTSFILE)"</XU_COMMAND>

<OC_REGISTER Condition="'$(OC_REGISTER)' == ''">user</OC_REGISTER>
<OC_VERSION Condition="'$(OC_VERSION)' == ''">4.7.922</OC_VERSION>
<OC_RUNNER Condition="'$(OC_RUNNER)' == ''">packages\OpenCover.$(OC_VERSION)\tools\OpenCover.Console.exe</OC_RUNNER>
<OC_FILTER Condition="'$(OC_FILTER)' == ''">+[NuLog*]* -[NuLog.Tests]* -[NuLog.NetFramework.Tests]* -[NuLog.CLI*]* -[NuLogSnippets*]*</OC_FILTER>
<OC_EXCLUDEFILES Condition="'$(OC_EXCLUDEFILES)' == ''">*Shim.cs</OC_EXCLUDEFILES>
<!-- OC_SEARCHDIRS SHOULD BE SEMI-COLON DELIMITED -->
<OC_SEARCHDIRS Condition="'$(OC_SEARCHDIRS)' == ''">NuLog.Tests\bin\Debug;NuLog.NetFramework.Tests\bin\Debug</OC_SEARCHDIRS>
<OC_COMMAND>$(OC_RUNNER) -output:"@(OC_RESULTSFILE)" -register:administrator -target:"$(XU_RUNNER)" -targetargs:"$(TESTS_DLLS) $(XU_EXCLUDE)" -filter:"$(OC_FILTER)" -excludebyfile:"$(OC_EXCLUDEFILES)" -searchdirs:$(OC_SEARCHDIRS)</OC_COMMAND>
<OC_COMMAND>$(OC_RUNNER) -output:"@(OC_RESULTSFILE)" -register:$(OC_REGISTER) -target:"$(XU_RUNNER)" -targetargs:"$(TESTS_DLLS) $(XU_EXCLUDE)" -filter:"$(OC_FILTER)" -excludebyfile:"$(OC_EXCLUDEFILES)" -searchdirs:$(OC_SEARCHDIRS)</OC_COMMAND>

<SQ_VERSION Condition="'$(SQ_VERSION)' == ''">4.9.0</SQ_VERSION>
<SQ_SCANNER Condition="'$(SQ_SCANNER)' == ''">packages\dotnet-framework-sonarscanner.$(SQ_VERSION)\tools\SonarScanner.MSBuild.exe</SQ_SCANNER>
Expand Down
Binary file removed NuLog.0.0.0-rc0.nupkg
Binary file not shown.
Binary file removed NuLog.Configuration.0.0.0-rc0.nupkg
Binary file not shown.
9 changes: 6 additions & 3 deletions NuLog.NetFramework.nuspec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>NuLog.NetFramework</id>
<version>0.0.0-rc0</version>
Expand All @@ -16,9 +16,12 @@
<copyright>©2020 Ivan Andrew Pointer</copyright>
<language>en-US</language>
<tags>log logging nulog tag</tags>
<dependencies>
<dependency id="NuLog" version="2.1.3-rc4" />
</dependencies>
</metadata>
<files>
<file src="Marketing\NuLog Logo Large.png" target="images\icon.png" />
<file src="..\NuLog\bin\Release\**" target="lib/{framework name}[{version}]" />
<file src="NuLog.NetFramework\bin\Release\**" target="lib" />
</files>
</package>
3 changes: 2 additions & 1 deletion NuLog.NetFramework/NuLog.NetFramework.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>bin\Release\net472\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand Down Expand Up @@ -54,6 +54,7 @@
<ProjectReference Include="..\NuLog\NuLog.csproj">
<Project>{9a062f61-209b-4ef0-8fe2-e9520aadf8cc}</Project>
<Name>NuLog</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
6 changes: 3 additions & 3 deletions NuLog.nuspec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>NuLog</id>
<version>0.0.0-rc0</version>
Expand All @@ -19,6 +19,6 @@
</metadata>
<files>
<file src="Marketing\NuLog Logo Large.png" target="images\icon.png" />
<file src="..\NuLog\bin\Release\**" target="lib/{framework name}[{version}]" />
<file src="NuLog\bin\Release\**" target="lib" />
</files>
</package>
Binary file modified nuget.exe
Binary file not shown.

0 comments on commit 199299b

Please sign in to comment.