Skip to content

Converted projects to netstandard2.0. #62

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

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

Converted projects to netstandard2.0. #62

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
98437a9
Converted projects to netstandard2.0.
bobend Oct 10, 2018
7121e0f
Added PackageId to match current nuget packages.
bobend Oct 23, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,4 @@ Backup*/
UpgradeLog*.XML

src/*/lib/*.dll
.vs/
15 changes: 0 additions & 15 deletions src/Demo.IronSharp/App.config
View file
Open in desktop

This file was deleted.

87 changes: 10 additions & 77 deletions src/Demo.IronSharp/Demo.IronSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,85 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4EFB32B2-4CD3-4604-9ADC-458A4FC4C50B}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Demo.IronSharpConsole</RootNamespace>
<AssemblyName>Demo.IronSharpConsole</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</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|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Tests\IntegrationTests.cs" />
<Compile Include="Tests\LongRunningIntegrationTests.cs" />
</ItemGroup>

<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
<PackageReference Include="Nunit" Version="3.11.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\IronSharp.Core\IronSharp.Core.csproj">
<Project>{1a6cc922-40a5-440a-868d-757fcdb08622}</Project>
<Name>IronSharp.Core</Name>
</ProjectReference>
<ProjectReference Include="..\IronSharp.IronCache\IronSharp.IronCache.csproj">
<Project>{2603e861-09ab-482e-bf28-41d8b0b1b20b}</Project>
<Name>IronSharp.IronCache</Name>
</ProjectReference>
<ProjectReference Include="..\IronSharp.IronMQ\IronSharp.IronMQ.csproj">
<Project>{d891a220-aa6f-4d0c-b012-b25875787ba0}</Project>
<Name>IronSharp.IronMQ</Name>
</ProjectReference>
<ProjectReference Include="..\IronSharp.IronWorker\IronSharp.IronWorker.csproj">
<Project>{4fa5bf5d-c543-404e-89ec-c3bff90acf6b}</Project>
<Name>IronSharp.IronWorker</Name>
</ProjectReference>
<ProjectReference Include="..\IronSharp.IronCache\IronSharp.IronCache.csproj" />
<ProjectReference Include="..\IronSharp.IronMQ\IronSharp.IronMQ.csproj" />
<ProjectReference Include="..\IronSharp.IronWorker\IronSharp.IronWorker.csproj" />
</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>
2 changes: 1 addition & 1 deletion src/Demo.IronSharp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal class Program
{
private static void Main(string[] args)
{
LogManager.Adapter = new ConsoleOutLoggerFactoryAdapter();
LogManager.Adapter = new DebugLoggerFactoryAdapter();

// =========================================================
// Iron.io MQ
Expand Down
39 changes: 0 additions & 39 deletions src/Demo.IronSharp/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/Demo.IronSharp/packages.config
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions src/IronSharp.Core/Config/IronDotConfigManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Web.Hosting;
using Common.Logging;
using Newtonsoft.Json;

Expand Down Expand Up @@ -120,9 +118,7 @@ private static string GetAppDirectory()
{
if (string.IsNullOrEmpty(_appDirectory))
{
_appDirectory = HostingEnvironment.IsHosted ?
HostingEnvironment.MapPath("~/") :
Path.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase);
_appDirectory = Directory.GetCurrentDirectory();
}
return _appDirectory;
}
Expand Down
131 changes: 18 additions & 113 deletions src/IronSharp.Core/IronSharp.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,120 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1A6CC922-40A5-440A-868D-757FCDB08622}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IronSharp.Core</RootNamespace>
<AssemblyName>IronSharp.Core</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Iron.Core</PackageId>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Jeremy Bell</Authors>
<Copyright>Iron.io</Copyright>
<PackageLicenseUrl>https://raw.github.com/iron-io/iron_dotnet/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/iron-io/iron_dotnet</PackageProjectUrl>
<PackageIconUrl>https://raw.github.com/iron-io/iron_dotnet/master/images/net-iron-core.png</PackageIconUrl>
<Description>Core configuration and other common features for IronSharp. Iron.io is a cloud application services provider that gives you immediate access to high-scale message queues, async processing, and caching.</Description>
<PackageReleaseNotes>Converted to NET Standard 2.0</PackageReleaseNotes>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
<VersionPrefix>3.0.11</VersionPrefix>
<VersionSuffix>localhost</VersionSuffix>
<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|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Publish|AnyCPU'">
<OutputPath>bin\Publish\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<IncludeSource>true</IncludeSource>
<IncludeSymbols>true</IncludeSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging">
<HintPath>..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.5.0.7\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
<Compile Include="$(SolutionDir)/SolutionInfo.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="Abstract\IRequestHelpersContainer.cs" />
<Compile Include="Abstract\ITokenContainer.cs" />
<Compile Include="Attributes\QueueNameAttribute.cs" />
<Compile Include="Config\KeystoneClientConfig.cs" />
<Compile Include="Constants\AuthHeaderLocation.cs" />
<Compile Include="DateTimeHelpers.cs" />
<Compile Include="DefaultValueSerializer.cs" />
<Compile Include="ExponentialBackoff.cs" />
<Compile Include="Extensions\ExtensionsForDictionary.cs" />
<Compile Include="Extensions\ExtensionsForIInspectable.cs" />
<Compile Include="Extensions\ExtensionsForIMsg.cs" />
<Compile Include="Extensions\ExtensionsForString.cs" />
<Compile Include="Abstract\IIdCollection.cs" />
<Compile Include="Abstract\IInspectable.cs" />
<Compile Include="Abstract\IIronSharpConfig.cs" />
<Compile Include="Abstract\IMsg.cs" />
<Compile Include="Abstract\IPagingFilter.cs" />
<Compile Include="Abstract\IRestClientRequest.cs" />
<Compile Include="Config\IronClientConfig.cs" />
<Compile Include="Config\IronDotConfigManager.cs" />
<Compile Include="Constants\IronProduct.cs" />
<Compile Include="Config\IronSharpConfig.cs" />
<Compile Include="Exceptions\IronSharpException.cs" />
<Compile Include="Abstract\IValueSerializer.cs" />
<Compile Include="JsonContent.cs" />
<Compile Include="JSON.cs" />
<Compile Include="Exceptions\MaximumRetryAttemptsExceededException.cs" />
<Compile Include="MqRestClient.cs" />
<Compile Include="Types\HttpRequestMessageBuilder.cs" />
<Compile Include="Types\IronTokenContainer.cs" />
<Compile Include="Types\Keystone.cs" />
<Compile Include="Types\KeystoneContainer.cs" />
<Compile Include="Types\PagingFilter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Config\HttpClientOptions.cs" />
<Compile Include="Types\ResponseMsg.cs" />
<Compile Include="RestClient.cs" />
<Compile Include="Types\RestClientRequest.cs" />
<Compile Include="Types\RestResponse.cs" />
<Compile Include="Exceptions\RestResponseException.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Content\iron.json" />
<None Include="Content\web.config.transform">
<SubType>Designer</SubType>
</None>
<None Include="IronSharp.Core.csproj.DotSettings" />
<None Include="IronSharp.Core.nuspec" />
<None Include="packages.config" />
<PackageReference Include="Common.Logging" Version="3.4.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
</ItemGroup>
<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>
7 changes: 0 additions & 7 deletions src/IronSharp.Core/IronSharp.Core.csproj.DotSettings
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/IronSharp.Core/IronSharp.Core.nuspec
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions src/IronSharp.Core/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

Loading