Skip to content

Commit

Permalink
Update to DevForce v7.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcelgood
marcelgood committed Apr 9, 2016
1 parent 1747605 commit 5d38ec4
Show file tree
Hide file tree
Showing 35 changed files with 1,331 additions and 210 deletions.
1,048 changes: 1,048 additions & 0 deletions .vs/config/applicationhost.config
View file

Large diffs are not rendered by default.

59 changes: 32 additions & 27 deletions Cocktail.Compat.SL/Cocktail.Compat.SL.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<IntermediateOutputPath>obj\$(Configuration)</IntermediateOutputPath>
<OutputPath>$(BaseOutputPath)\$(Configuration)</OutputPath>
<DocumentationFile>$(BaseOutputPath)\$(Configuration)\Cocktail.Compat.SL.xml</DocumentationFile>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<!-- This property group is only here to support building this project using the
MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs
Expand Down Expand Up @@ -62,25 +64,25 @@
<Reference Include="Caliburn.Micro.Platform">
<HintPath>..\packages\Caliburn.Micro.2.0.2\lib\sl5\Caliburn.Micro.Platform.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Core.SL, Version=7.3.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.Core.SL.dll</HintPath>
<Reference Include="IdeaBlade.Core.SL, Version=7.4.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.4.0\lib\sl5\IdeaBlade.Core.SL.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="IdeaBlade.EntityModel.Compat.SL, Version=7.3.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Compat.7.3.0\lib\sl50\IdeaBlade.EntityModel.Compat.SL.dll</HintPath>
<Reference Include="IdeaBlade.EntityModel.Compat.SL, Version=7.4.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<HintPath>..\packages\IdeaBlade.DevForce.Compat.7.4.0\lib\sl5\IdeaBlade.EntityModel.Compat.SL.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="IdeaBlade.EntityModel.SL, Version=7.3.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.EntityModel.SL.dll</HintPath>
<Reference Include="IdeaBlade.EntityModel.SL, Version=7.4.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.4.0\lib\sl5\IdeaBlade.EntityModel.SL.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="IdeaBlade.Linq.SL, Version=7.3.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.Linq.SL.dll</HintPath>
<Reference Include="IdeaBlade.Linq.SL, Version=7.4.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.4.0\lib\sl5\IdeaBlade.Linq.SL.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="IdeaBlade.Validation.SL, Version=7.3.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\sl50\IdeaBlade.Validation.SL.dll</HintPath>
<Reference Include="IdeaBlade.Validation.SL, Version=7.4.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.4.0\lib\sl5\IdeaBlade.Validation.SL.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -99,17 +101,17 @@
<Reference Include="System.ComponentModel.Composition.Initialization, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.ComponentModel.DataAnnotations, Version=5.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
<Reference Include="System.IO, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\sl5\System.IO.dll</HintPath>
<HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\sl5\System.IO.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime, Version=2.6.8.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\sl5\System.Runtime.dll</HintPath>
<Reference Include="System.Runtime, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\sl5\System.Runtime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Threading.Tasks, Version=2.6.8.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\sl5\System.Threading.Tasks.dll</HintPath>
<Reference Include="System.Threading.Tasks, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\sl5\System.Threading.Tasks.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" />
<Reference Include="system" />
Expand Down Expand Up @@ -142,6 +144,7 @@
<Compile Include="..\Cocktail.Compat\TaskExtensions.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Cocktail.snk" />
<None Include="packages.config" />
</ItemGroup>
Expand Down Expand Up @@ -170,10 +173,12 @@ xcopy "$(TargetDir)$(TargetName).dll" "$(SolutionDir)Bin\sl50\$(ConfigurationNam
xcopy "$(TargetDir)$(TargetName).xml" "$(SolutionDir)Bin\sl50\$(ConfigurationName)" /y
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
</Target>
<!-- 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.
Expand Down
31 changes: 31 additions & 0 deletions Cocktail.Compat.SL/app.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="mscorlib" publicKeyToken="7cec85d7bea7798e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Core" publicKeyToken="7cec85d7bea7798e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System" publicKeyToken="7cec85d7bea7798e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Windows" publicKeyToken="7cec85d7bea7798e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
8 changes: 4 additions & 4 deletions Cocktail.Compat.SL/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<packages>
<package id="Caliburn.Micro" version="2.0.2" targetFramework="sl50" />
<package id="Caliburn.Micro.Core" version="2.0.2" targetFramework="sl50" />
<package id="IdeaBlade.DevForce.Compat" version="7.3.0" targetFramework="sl50" />
<package id="IdeaBlade.DevForce.Core" version="7.3.0" targetFramework="sl50" />
<package id="Microsoft.Bcl" version="1.1.8" targetFramework="sl50" />
<package id="IdeaBlade.DevForce.Compat" version="7.4.0" targetFramework="sl5" />
<package id="IdeaBlade.DevForce.Core" version="7.4.0" targetFramework="sl5" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="sl5" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="sl50" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="sl50" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="sl5" />
</packages>
30 changes: 15 additions & 15 deletions Cocktail.Compat/Cocktail.Compat.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,25 @@
<Reference Include="Caliburn.Micro.Platform">
<HintPath>..\packages\Caliburn.Micro.2.0.2\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Core, Version=7.3.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\net45\IdeaBlade.Core.dll</HintPath>
<Reference Include="IdeaBlade.Core, Version=7.4.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.4.0\lib\net45\IdeaBlade.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="IdeaBlade.EntityModel, Version=7.3.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\net45\IdeaBlade.EntityModel.dll</HintPath>
<Reference Include="IdeaBlade.EntityModel, Version=7.4.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.4.0\lib\net45\IdeaBlade.EntityModel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="IdeaBlade.EntityModel.Compat, Version=7.3.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Compat.7.3.0\lib\net45\IdeaBlade.EntityModel.Compat.dll</HintPath>
<Reference Include="IdeaBlade.EntityModel.Compat, Version=7.4.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<HintPath>..\packages\IdeaBlade.DevForce.Compat.7.4.0\lib\net45\IdeaBlade.EntityModel.Compat.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="IdeaBlade.Linq, Version=7.3.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\net45\IdeaBlade.Linq.dll</HintPath>
<Reference Include="IdeaBlade.Linq, Version=7.4.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.4.0\lib\net45\IdeaBlade.Linq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="IdeaBlade.Validation, Version=7.3.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.3.0\lib\net45\IdeaBlade.Validation.dll</HintPath>
<Reference Include="IdeaBlade.Validation, Version=7.4.0.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.4.0\lib\net45\IdeaBlade.Validation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand Down
2 changes: 1 addition & 1 deletion Cocktail.Compat/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@
// Build Number
// Revision

[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyVersion("2.6.1")]
4 changes: 2 additions & 2 deletions Cocktail.Compat/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<packages>
<package id="Caliburn.Micro" version="2.0.2" targetFramework="net45" />
<package id="Caliburn.Micro.Core" version="2.0.2" targetFramework="net45" />
<package id="IdeaBlade.DevForce.Compat" version="7.3.0" targetFramework="net45" />
<package id="IdeaBlade.DevForce.Core" version="7.3.0" targetFramework="net45" />
<package id="IdeaBlade.DevForce.Compat" version="7.4.0" targetFramework="net45" />
<package id="IdeaBlade.DevForce.Core" version="7.4.0" targetFramework="net45" />
</packages>
Loading

0 comments on commit 5d38ec4

Please sign in to comment.