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.

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

Upgrade/net.standard.2.0 #11

Merged
merged 5 commits into from Apr 13, 2018
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

First pass of migrating to dot net standard 2

  • Loading branch information
SwankMotionPictures committed Aug 28, 2017
commit dce60e7111fa79d24784c8b7b9f79f0d44ab7b41
@@ -20,7 +20,7 @@ public override string ToString()
}

class Program
{
{
static void Main(string[] argArray)
{
GlobalContext.Properties["GlobalContextPropertySample"] = new GlobalContextTest();
@@ -77,13 +77,13 @@ static void Main(string[] argArray)
});

newThread2.Start();

//Test self referencing
var parent = new Person { Name = "John Smith" };
var child1 = new Person { Name = "Bob Smith", Parent = parent };
var child2 = new Person { Name = "Suzy Smith", Parent = parent };
parent.Children = new List<Person> { child1, child2 };
log.Info(parent);
var parent = new Person { Name = "John Smith" };
var child1 = new Person { Name = "Bob Smith", Parent = parent };
var child2 = new Person { Name = "Suzy Smith", Parent = parent };
parent.Children = new List<Person> { child1, child2 };
log.Info(parent);

log.Debug("zzzz");
log.InfoFormat("Loggly is the best {0} to collect Logs.", "service");
@@ -93,5 +93,5 @@ static void Main(string[] argArray)

Console.ReadKey();
}
}
}
}

This file was deleted.

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Collections.Generic;

namespace log4net_loggly_console
{
@@ -20,17 +17,17 @@ public TestObject()
TOField4 = new { TOFF1 = "TOFFValue1", TOFF2 = "TOFFValue2" };
}
}
//test self referencing
class Person
{
public string Name;
public Person Parent;
public List<Person> Children;
}
//test self referencing
class Person
{
public string Name;
public Person Parent;
public List<Person> Children;
}

class Child : Person
{
public string Name;
class Child : Person
{
public string Name;

}
}
}
@@ -1,74 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0FA10015-A535-484E-8700-C06893FCE2BB}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>log4net_loggly_console</RootNamespace>
<AssemblyName>log4net-loggly-console</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.7\lib\net40-client\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TestObject.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\log4net-loggly\log4net-loggly.csproj">
<Project>{ABE2B1B6-A83C-4604-AF87-FAAC3976530D}</Project>
<Name>log4net-loggly</Name>
</ProjectReference>
<PackageReference Include="log4net" Version="2.0.8" />
</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>
-->
</Project>

</Project>

This file was deleted.

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.