Skip to content

Commit

Permalink
Support NetStandard 2.0 (#12)
Browse files Browse the repository at this point in the history
* Added a license file.

Package now targets netStandard2.0 and net461 to support older tooling.
  • Loading branch information
jpenniman authored and fredericDelaporte committed Apr 14, 2018
1 parent 59484aa commit ad6b759
Show file tree
Hide file tree
Showing 23 changed files with 1,215 additions and 719 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*.suo
*.user
*.sln.docstates
*.sln.GhostDoc.xml

# Build results
[Dd]ebug/
Expand Down
504 changes: 504 additions & 0 deletions LICENSE.md

Large diffs are not rendered by default.

Binary file modified src/.nuget/NuGet.exe
Binary file not shown.
10 changes: 0 additions & 10 deletions src/Generator/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,5 @@
// NHibernate.Mapping.Attributes.Generator
// This product is under the terms of the GNU Lesser General Public License.
//
using System.Reflection;

[assembly: AssemblyProduct("NHibernate.Mapping.Attributes.Generator")]
[assembly: AssemblyTitle("NHibernate.Mapping.Attributes.Generator for Microsoft .NET Framework 4.0")]
[assembly: AssemblyDescription("Generate NHibernate.Mapping.Attributes.")]
[assembly: AssemblyCompany("nhibernate.org")]
[assembly: AssemblyCopyright("Under the terms of the GNU Lesser General Public License.")]

[assembly: AssemblyVersion("4.0.0.0")]

[assembly: System.CLSCompliant(true)]
[assembly: System.Runtime.InteropServices.ComVisible(false)]
153 changes: 10 additions & 143 deletions src/Generator/Generator.csproj
Original file line number Diff line number Diff line change
@@ -1,151 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../NHibernate.Mapping.Attributes.props" />
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{22CADD56-EF07-4040-A171-BC5A3AB896FD}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>App.ico</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>NHibernate.Mapping.Attributes.Generator</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<Product>NHibernate.Mapping.Attributes.Generator</Product>
<Description>NHibernate.Mapping.Attributes code generator.</Description>
<TargetFramework>net461</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>NHibernate.Mapping.Attributes.Generator</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<AssemblyName>NHibernate.Mapping.Attributes.Generator</AssemblyName>
<IsPackable>false</IsPackable>
<ApplicationIcon>App.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net">
<HintPath>..\..\lib\net\4.0\log4net.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
<ProjectReference Include="..\Refly\Refly.csproj">
<Name>Refly</Name>
<Project>{53086B22-3A6C-4017-ADB7-F22BF49FFF58}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<Content Include="App.ico" />
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="AttributeAndEnumGenerator.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="HbmWriterGenerator.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Program.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Utils.cs">
<SubType>Code</SubType>
</Compile>
<None Include="packages.config" />
<ProjectReference Include="..\Refly\Refly.csproj" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<PackageReference Include="log4net" Version="2.0.8" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Generator/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ static void Main()
log.Info("Generation of NHibernate.Mapping.Attributes");

// Open the Schema (in /NHMA/ directory)
System.Xml.XmlTextReader reader = new System.Xml.XmlTextReader("../../../NHibernate.Mapping.Attributes/nhibernate-mapping.xsd");
System.Xml.XmlTextReader reader = new System.Xml.XmlTextReader("../../../../NHibernate.Mapping.Attributes/nhibernate-mapping.xsd");
schema = System.Xml.Schema.XmlSchema.Read(reader, null);

Refly.CodeDom.NamespaceDeclaration nd = new Refly.CodeDom.NamespaceDeclaration("NHibernate.Mapping.Attributes", conformer);
Expand Down Expand Up @@ -371,7 +371,7 @@ the code is regenerated.
#endregion

log.Info("CodeGenerator.GenerateCode()... Classes=" + nd.Classes.Count + ", Enums=" + nd.Enums.Count);
gen.GenerateCode(@"../../../NHibernate.Mapping.Attributes", nd);
gen.GenerateCode(@"../../../../NHibernate.Mapping.Attributes", nd);
log.Info("Done !");
}
catch(System.Exception ex)
Expand Down
4 changes: 0 additions & 4 deletions src/Generator/packages.config

This file was deleted.

22 changes: 13 additions & 9 deletions src/NHibernate.Mapping.Attributes.Generator.sln
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2027
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E454F68D-C4C2-4D44-8761-E1E6C6276EB8}"
ProjectSection(SolutionItems) = preProject
NHibernate.snk = NHibernate.snk
NHibernate.Mapping.Attributes.props = NHibernate.Mapping.Attributes.props
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "Generator\Generator.csproj", "{22CADD56-EF07-4040-A171-BC5A3AB896FD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refly", "Refly\Refly.csproj", "{53086B22-3A6C-4017-ADB7-F22BF49FFF58}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Mapping.Attributes", "NHibernate.Mapping.Attributes\NHibernate.Mapping.Attributes.csproj", "{AE0F3023-0ED6-45BE-8995-8C3B2E585A20}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Mapping.Attributes.Test", "NHibernate.Mapping.Attributes.Test\NHibernate.Mapping.Attributes.Test.csproj", "{A6585067-79C1-41A9-A006-A83C3A800B21}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.Mapping.Attributes", "NHibernate.Mapping.Attributes\NHibernate.Mapping.Attributes.csproj", "{BA0B9218-3A5D-4842-9E75-D71DF3BDE65F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -29,16 +30,19 @@ Global
{53086B22-3A6C-4017-ADB7-F22BF49FFF58}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53086B22-3A6C-4017-ADB7-F22BF49FFF58}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53086B22-3A6C-4017-ADB7-F22BF49FFF58}.Release|Any CPU.Build.0 = Release|Any CPU
{AE0F3023-0ED6-45BE-8995-8C3B2E585A20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE0F3023-0ED6-45BE-8995-8C3B2E585A20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE0F3023-0ED6-45BE-8995-8C3B2E585A20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE0F3023-0ED6-45BE-8995-8C3B2E585A20}.Release|Any CPU.Build.0 = Release|Any CPU
{A6585067-79C1-41A9-A006-A83C3A800B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6585067-79C1-41A9-A006-A83C3A800B21}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6585067-79C1-41A9-A006-A83C3A800B21}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6585067-79C1-41A9-A006-A83C3A800B21}.Release|Any CPU.Build.0 = Release|Any CPU
{BA0B9218-3A5D-4842-9E75-D71DF3BDE65F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA0B9218-3A5D-4842-9E75-D71DF3BDE65F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA0B9218-3A5D-4842-9E75-D71DF3BDE65F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA0B9218-3A5D-4842-9E75-D71DF3BDE65F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5BB0227F-ECE1-4DC7-8F89-3FF67E0484CB}
EndGlobalSection
EndGlobal
Loading

0 comments on commit ad6b759

Please sign in to comment.