Skip to content

Commit f8b9fbe

Browse files
committed
Update the SIF Framework to use SIF Infrastructure 3.2.1 and AU Data Model 3.4.1.
1 parent 684394e commit f8b9fbe

42 files changed

Lines changed: 60447 additions & 76 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Code/Sif3Framework/Sif.Framework.EnvironmentProvider/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
//
3232
// You can specify all the values or you can default the Revision and Build Numbers
3333
// by using the '*' as shown below:
34-
[assembly: AssemblyVersion("3.2.0.0")]
35-
[assembly: AssemblyFileVersion("3.2.0.0")]
34+
[assembly: AssemblyVersion("3.2.1.0")]
35+
[assembly: AssemblyFileVersion("3.2.1.0")]

Code/Sif3Framework/Sif.Framework.EnvironmentProvider/Sif.Framework.EnvironmentProvider.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
<SpecificVersion>False</SpecificVersion>
5858
<HintPath>..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
5959
</Reference>
60-
<Reference Include="Sif.Specification.Infrastructure, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
60+
<Reference Include="Sif.Specification.Infrastructure, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
6161
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.0\Sif.Specification.Infrastructure.dll</HintPath>
62+
<HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.1\Sif.Specification.Infrastructure.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System.Data.SQLite, Version=1.0.94.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
6565
<SpecificVersion>False</SpecificVersion>

Code/Sif3Framework/Sif.Framework.Tests/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.2.0.0")]
36-
[assembly: AssemblyFileVersion("3.2.0.0")]
35+
[assembly: AssemblyVersion("3.2.1.0")]
36+
[assembly: AssemblyFileVersion("3.2.1.0")]

Code/Sif3Framework/Sif.Framework.Tests/Sif.Framework.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<SpecificVersion>False</SpecificVersion>
4444
<HintPath>..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
4545
</Reference>
46-
<Reference Include="Sif.Specification.Infrastructure, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
46+
<Reference Include="Sif.Specification.Infrastructure, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
4747
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.0\Sif.Specification.Infrastructure.dll</HintPath>
48+
<HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.1\Sif.Specification.Infrastructure.dll</HintPath>
4949
</Reference>
5050
<Reference Include="System" />
5151
<Reference Include="System.ComponentModel.DataAnnotations" />

Code/Sif3Framework/Sif.Framework/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("Sif.Framework")]
9-
[assembly: AssemblyDescription("Core library of the SIF3 Framework based on SIF Infrastructure 3.2.")]
9+
[assembly: AssemblyDescription("Core library of the SIF3 Framework based on SIF Infrastructure 3.2.1")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Systemic Pty Ltd")]
1212
[assembly: AssemblyProduct("Sif.Framework")]
@@ -32,8 +32,8 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.2.0.0")]
36-
[assembly: AssemblyFileVersion("3.2.0.0")]
35+
[assembly: AssemblyVersion("3.2.1.0")]
36+
[assembly: AssemblyFileVersion("3.2.1.0")]
3737

3838
// Configure log4net using the .config file
3939
[assembly: log4net.Config.XmlConfigurator(Watch = true)]

Code/Sif3Framework/Sif.Framework/Service/Mapper/MapperFactory.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ static MapperFactory()
165165
AutoMapper.Mapper.CreateMap<Environment, environmentType>()
166166
.ForMember(dest => dest.infrastructureServices, opt => opt.MapFrom(src => src.InfrastructureServices.Values))
167167
.ForMember(dest => dest.provisionedZones, opt => opt.MapFrom(src => src.ProvisionedZones.Values))
168-
.ForMember(dest => dest.typeSpecified, opt => opt.UseValue<bool>(true));
168+
.ForMember(dest => dest.typeSpecified, opt => opt.UseValue<bool>(true))
169+
.ForMember(dest => dest.fingerprint, opt => opt.Ignore());
169170
AutoMapper.Mapper.CreateMap<environmentType, Environment>();
170171

171172
AutoMapper.Mapper.CreateMap<ProductIdentity, productIdentityType>();
@@ -225,7 +226,8 @@ static MapperFactory()
225226
.ForMember(dest => dest.createdSpecified, opt => opt.MapFrom(src => src.Created != null))
226227
.ForMember(dest => dest.lastModifiedSpecified, opt => opt.MapFrom(src => src.LastModified != null))
227228
.ForMember(dest => dest.stateSpecified, opt => opt.MapFrom(src => src.State != null))
228-
.ForMember(dest => dest.timeout, opt => opt.MapFrom(src => XmlConvert.ToString(src.Timeout)));
229+
.ForMember(dest => dest.timeout, opt => opt.MapFrom(src => XmlConvert.ToString(src.Timeout)))
230+
.ForMember(dest => dest.initialization, opt => opt.Ignore());
229231
AutoMapper.Mapper.CreateMap<jobType, Job>()
230232
.ForMember(dest => dest.Timeout, opt => opt.MapFrom(src => XmlConvert.ToTimeSpan(src.timeout)));
231233

Code/Sif3Framework/Sif.Framework/Sif.Framework.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@
5757
<SpecificVersion>False</SpecificVersion>
5858
<HintPath>..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
5959
</Reference>
60-
<Reference Include="Sif.Specification.Infrastructure">
61-
<HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.0\Sif.Specification.Infrastructure.dll</HintPath>
60+
<Reference Include="Sif.Specification.Infrastructure, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
61+
<SpecificVersion>False</SpecificVersion>
62+
<HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.1\Sif.Specification.Infrastructure.dll</HintPath>
6263
</Reference>
6364
<Reference Include="System" />
6465
<Reference Include="System.Configuration" />

Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.2.0.0")]
36-
[assembly: AssemblyFileVersion("3.2.0.0")]
35+
[assembly: AssemblyVersion("3.2.1.0")]
36+
[assembly: AssemblyFileVersion("3.2.1.0")]
3737

3838
// Configure log4net using the .config file
3939
[assembly: log4net.Config.XmlConfigurator(Watch = true)]

Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Consumer/Sif.Framework.Demo.Au.Consumer.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@
4444
<Reference Include="log4net">
4545
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Sif.Framework, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
47+
<Reference Include="Sif.Framework, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
4848
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\..\SharedLibs\Sif.Framework 3.2.0\Sif.Framework.dll</HintPath>
49+
<HintPath>..\..\..\SharedLibs\Sif.Framework 3.2.1\Sif.Framework.dll</HintPath>
5050
</Reference>
51-
<Reference Include="Sif.Specification.DataModel.Au, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
51+
<Reference Include="Sif.Specification.DataModel.Au, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
5252
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\..\SharedLibs\Sif.Specification.DataModel.Au 3.4\Sif.Specification.DataModel.Au.dll</HintPath>
53+
<HintPath>..\..\..\SharedLibs\Sif.Specification.DataModel.Au 3.4.1\Sif.Specification.DataModel.Au.dll</HintPath>
5454
</Reference>
55-
<Reference Include="Sif.Specification.Infrastructure, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
55+
<Reference Include="Sif.Specification.Infrastructure, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
5656
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.0\Sif.Specification.Infrastructure.dll</HintPath>
57+
<HintPath>..\..\..\SharedLibs\Sif.Specification.Infrastructure 3.2.1\Sif.Specification.Infrastructure.dll</HintPath>
5858
</Reference>
5959
<Reference Include="System" />
6060
<Reference Include="System.Core" />

Code/Sif3FrameworkDemo/Sif.Framework.Demo.Au.Provider/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
//
3232
// You can specify all the values or you can default the Revision and Build Numbers
3333
// by using the '*' as shown below:
34-
[assembly: AssemblyVersion("3.2.0.0")]
35-
[assembly: AssemblyFileVersion("3.2.0.0")]
34+
[assembly: AssemblyVersion("3.2.1.0")]
35+
[assembly: AssemblyFileVersion("3.2.1.0")]

0 commit comments

Comments
 (0)