Skip to content

Commit 1efd7ec

Browse files
author
Ethan Hann
committed
Merge branch 'develop'
2 parents fdae4ce + e4bbe05 commit 1efd7ec

File tree

13 files changed

+40
-94
lines changed

13 files changed

+40
-94
lines changed

‎IntegrationEngine.Core/IntegrationEngine.Core.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
</Reference>
7070
</ItemGroup>
7171
<ItemGroup>
72+
<Compile Include="..\configuration\SharedAssemblyInfo.cs">
73+
<Link>Properties\SharedAssemblyInfo.cs</Link>
74+
</Compile>
7275
<Compile Include="Configuration\DatabaseConfiguration.cs" />
7376
<Compile Include="Configuration\MailConfiguration.cs" />
7477
<Compile Include="Jobs\IIntegrationJob.cs" />

‎IntegrationEngine.Core/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("IntegrationEngine.Core")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("Ethan Hann")]
12-
[assembly: AssemblyProduct("IntegrationEngine.Core")]
13-
[assembly: AssemblyCopyright("Copyright © Ethan Hann 2015")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
169

1710
// Setting ComVisible to false makes the types in this assembly not visible
1811
// to COM components. If you need to access a type in this assembly from
@@ -22,15 +15,3 @@
2215
// The following GUID is for the ID of the typelib if this project is exposed to COM
2316
[assembly: Guid("3aa24daf-9a91-41e3-a716-e0bea1c9a8ae")]
2417

25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

‎IntegrationEngine.Core/package.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0"?>
22
<package >
33
<metadata>
4-
<id>IntegrationEngine.Core</id>
5-
<version>2.0.0-alpha2</version>
4+
<id>$id$</id>
5+
<version>$version$</version>
66
<title>InEngine.NET Core</title>
7-
<authors>Ethan Hann</authors>
7+
<authors>$author$</authors>
88
<owners>Ethan Hann</owners>
99
<licenseUrl>https://github.com/ethanhann/InEngine.NET/blob/master/IntegrationEngine/LICENSE</licenseUrl>
1010
<projectUrl>https://github.com/ethanhann/InEngine.NET</projectUrl>
@@ -19,7 +19,7 @@
1919
<dependencies>
2020
<dependency id="Elasticsearch.Net" version="1.3.1"/>
2121
<dependency id="EntityFramework" version="6.1.2" />
22-
<dependency id="IntegrationEngine.Model" version="2.0.0-alpha2" />
22+
<dependency id="IntegrationEngine.Model" version="$version$" />
2323
<dependency id="log4net" version="2.0.3" />
2424
<dependency id="MySql.Data" version="6.9.5" />
2525
<dependency id="MySql.Data.Entity" version="6.9.5" />

‎IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
<Reference Include="System.Xml" />
4141
</ItemGroup>
4242
<ItemGroup>
43+
<Compile Include="..\configuration\SharedAssemblyInfo.cs">
44+
<Link>Properties\SharedAssemblyInfo.cs</Link>
45+
</Compile>
4346
<Compile Include="..\IntegrationEngine.Model\IHasStringId.cs">
4447
<Link>IHasStringId.cs</Link>
4548
</Compile>

‎IntegrationEngine.Model.net40/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("IntegrationEngine.Model.Net4")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("Ethan Hann")]
12-
[assembly: AssemblyProduct("")]
13-
[assembly: AssemblyCopyright("Copyright © Ethan Hann 2015")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
169

1710
// Setting ComVisible to false makes the types in this assembly not visible
1811
// to COM components. If you need to access a type in this assembly from
@@ -21,16 +14,3 @@
2114

2215
// The following GUID is for the ID of the typelib if this project is exposed to COM
2316
[assembly: Guid("9e42b9d5-8f4b-4fa8-9877-c9994ce2e5ea")]
24-
25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

‎IntegrationEngine.Model/IntegrationEngine.Model.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
<Reference Include="System.Xml" />
4141
</ItemGroup>
4242
<ItemGroup>
43+
<Compile Include="..\configuration\SharedAssemblyInfo.cs">
44+
<Link>Properties\SharedAssemblyInfo.cs</Link>
45+
</Compile>
4346
<Compile Include="IHasStringId.cs" />
4447
<Compile Include="Properties\AssemblyInfo.cs" />
4548
<Compile Include="CronTrigger.cs" />

‎IntegrationEngine.Model/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("IntegrationEngine.Model")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("Ethan Hann")]
12-
[assembly: AssemblyProduct("IntegrationEngine.Model")]
13-
[assembly: AssemblyCopyright("Copyright © Ethan Hann 2015")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
169

1710
// Setting ComVisible to false makes the types in this assembly not visible
1811
// to COM components. If you need to access a type in this assembly from
@@ -21,16 +14,3 @@
2114

2215
// The following GUID is for the ID of the typelib if this project is exposed to COM
2316
[assembly: Guid("bc838db8-9d9f-455e-8f91-e207d30b99b5")]
24-
25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

‎IntegrationEngine.Model/package.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0"?>
22
<package >
33
<metadata>
4-
<id>IntegrationEngine.Model</id>
5-
<version>2.0.0-alpha2</version>
4+
<id>$id$</id>
5+
<version>$version$</version>
66
<title>InEngine.NET Model</title>
7-
<authors>Ethan Hann</authors>
7+
<authors>$author$</authors>
88
<owners>Ethan Hann</owners>
99
<licenseUrl>https://github.com/ethanhann/InEngine.NET/blob/master/IntegrationEngine/LICENSE</licenseUrl>
1010
<projectUrl>https://github.com/ethanhann/InEngine.NET</projectUrl>

‎IntegrationEngine.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30723.0
4+
VisualStudioVersion = 12.0.31101.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationEngine", "IntegrationEngine\IntegrationEngine.csproj", "{7D49353D-A68C-4ACA-A6A5-40B1C314C30E}"
77
EndProject
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
1313
package.cmd = package.cmd
1414
README.md = README.md
1515
release.cmd = release.cmd
16+
configuration\SharedAssemblyInfo.cs = configuration\SharedAssemblyInfo.cs
1617
EndProjectSection
1718
EndProject
1819
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationEngine.Core", "IntegrationEngine.Core\IntegrationEngine.Core.csproj", "{3F3794D7-4078-4D26-954C-7864173EDD86}"

‎IntegrationEngine/IntegrationEngine.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@
129129
</Reference>
130130
</ItemGroup>
131131
<ItemGroup>
132+
<Compile Include="..\configuration\SharedAssemblyInfo.cs">
133+
<Link>Properties\SharedAssemblyInfo.cs</Link>
134+
</Compile>
132135
<Compile Include="Api\Controllers\JobController.cs" />
133136
<Compile Include="Api\IntegrationEngineApi.cs" />
134137
<Compile Include="Api\Startup.cs" />

0 commit comments

Comments
 (0)