Skip to content

Commit

Permalink
Update to DevForce v7.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcelgood
marcelgood committed Jul 31, 2014
1 parent 5d2d1b6 commit 53a4244
Show file tree
Hide file tree
Showing 128 changed files with 693 additions and 2,250 deletions.
6 changes: 0 additions & 6 deletions .nuget/NuGet.Config
View file

This file was deleted.

139 changes: 0 additions & 139 deletions .nuget/NuGet.targets
View file

This file was deleted.

Binary file removed .nuget/nuget.exe
View file
Binary file not shown.
21 changes: 10 additions & 11 deletions Cocktail.Compat.SL/Cocktail.Compat.SL.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,25 @@
<Reference Include="Caliburn.Micro">
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\sl5\Caliburn.Micro.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Core.SL, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.Core.SL, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\sl50\IdeaBlade.Core.SL.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\sl50\IdeaBlade.Core.SL.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.EntityModel.Compat.SL, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.EntityModel.Compat.SL, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Compat.7.2.3\lib\sl50\IdeaBlade.EntityModel.Compat.SL.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Compat.7.2.4\lib\sl50\IdeaBlade.EntityModel.Compat.SL.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.EntityModel.SL, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.EntityModel.SL, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\sl50\IdeaBlade.EntityModel.SL.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\sl50\IdeaBlade.EntityModel.SL.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Linq.SL, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.Linq.SL, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\sl50\IdeaBlade.Linq.SL.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\sl50\IdeaBlade.Linq.SL.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Validation.SL, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.Validation.SL, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\sl50\IdeaBlade.Validation.SL.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\sl50\IdeaBlade.Validation.SL.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CompilerServices.AsyncTargetingPack.Silverlight5">
<HintPath>..\packages\Microsoft.CompilerServices.AsyncTargetingPack.1.0.1\lib\sl50\Microsoft.CompilerServices.AsyncTargetingPack.Silverlight5.dll</HintPath>
Expand Down Expand Up @@ -142,7 +142,6 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<PropertyGroup>
<PostBuildEvent>mkdir "$(SolutionDir)Bin\sl50\$(ConfigurationName)"
xcopy "$(TargetDir)$(TargetName).dll" "$(SolutionDir)Bin\sl50\$(ConfigurationName)" /y
Expand Down
4 changes: 2 additions & 2 deletions Cocktail.Compat.SL/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Caliburn.Micro" version="1.5.2" targetFramework="sl50" />
<package id="IdeaBlade.DevForce.Compat" version="7.2.3" targetFramework="sl50" />
<package id="IdeaBlade.DevForce.Core" version="7.2.3" targetFramework="sl50" />
<package id="IdeaBlade.DevForce.Compat" version="7.2.4" targetFramework="sl50" />
<package id="IdeaBlade.DevForce.Core" version="7.2.4" targetFramework="sl50" />
<package id="Microsoft.CompilerServices.AsyncTargetingPack" version="1.0.1" targetFramework="sl50" />
</packages>
21 changes: 10 additions & 11 deletions Cocktail.Compat/Cocktail.Compat.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,25 @@
<Reference Include="Caliburn.Micro">
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\net45\Caliburn.Micro.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Core, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.Core, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\net45\IdeaBlade.Core.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\net45\IdeaBlade.Core.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.EntityModel, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.EntityModel, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\net45\IdeaBlade.EntityModel.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\net45\IdeaBlade.EntityModel.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.EntityModel.Compat, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.EntityModel.Compat, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Compat.7.2.3\lib\net45\IdeaBlade.EntityModel.Compat.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Compat.7.2.4\lib\net45\IdeaBlade.EntityModel.Compat.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Linq, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.Linq, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\net45\IdeaBlade.Linq.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\net45\IdeaBlade.Linq.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Validation, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.Validation, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\net45\IdeaBlade.Validation.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\net45\IdeaBlade.Validation.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand Down Expand Up @@ -111,7 +111,6 @@
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<PropertyGroup>
<PostBuildEvent>mkdir "$(SolutionDir)Bin\net45\$(ConfigurationName)"
xcopy "$(TargetDir)$(TargetName).dll" "$(SolutionDir)Bin\net45\$(ConfigurationName)" /y
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.4.4")]
[assembly: AssemblyVersion("2.4.5")]
4 changes: 2 additions & 2 deletions Cocktail.Compat/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Caliburn.Micro" version="1.5.2" targetFramework="net45" />
<package id="IdeaBlade.DevForce.Compat" version="7.2.3" targetFramework="net45" />
<package id="IdeaBlade.DevForce.Core" version="7.2.3" targetFramework="net45" />
<package id="IdeaBlade.DevForce.Compat" version="7.2.4" targetFramework="net45" />
<package id="IdeaBlade.DevForce.Core" version="7.2.4" targetFramework="net45" />
</packages>
17 changes: 8 additions & 9 deletions Cocktail.SL/Cocktail.SL.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,21 @@
<Reference Include="Caliburn.Micro">
<HintPath>..\packages\Caliburn.Micro.1.5.2\lib\sl5\Caliburn.Micro.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Core.SL, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.Core.SL, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\sl50\IdeaBlade.Core.SL.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\sl50\IdeaBlade.Core.SL.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.EntityModel.SL, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.EntityModel.SL, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\sl50\IdeaBlade.EntityModel.SL.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\sl50\IdeaBlade.EntityModel.SL.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Linq.SL, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.Linq.SL, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\sl50\IdeaBlade.Linq.SL.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\sl50\IdeaBlade.Linq.SL.dll</HintPath>
</Reference>
<Reference Include="IdeaBlade.Validation.SL, Version=7.2.3.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<Reference Include="IdeaBlade.Validation.SL, Version=7.2.4.0, Culture=neutral, PublicKeyToken=287b5094865421c0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.3\lib\sl50\IdeaBlade.Validation.SL.dll</HintPath>
<HintPath>..\packages\IdeaBlade.DevForce.Core.7.2.4\lib\sl50\IdeaBlade.Validation.SL.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CompilerServices.AsyncTargetingPack.Silverlight5">
<HintPath>..\packages\Microsoft.CompilerServices.AsyncTargetingPack.1.0.1\lib\sl50\Microsoft.CompilerServices.AsyncTargetingPack.Silverlight5.dll</HintPath>
Expand Down Expand Up @@ -261,7 +261,6 @@ xcopy "$(TargetDir)$(TargetName).dll" "$(SolutionDir)Bin\sl50\$(ConfigurationNam
xcopy "$(TargetDir)$(TargetName).xml" "$(SolutionDir)Bin\sl50\$(ConfigurationName)" /y
</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.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">
Expand Down
2 changes: 1 addition & 1 deletion Cocktail.SL/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Caliburn.Micro" version="1.5.2" targetFramework="sl50" />
<package id="IdeaBlade.DevForce.Core" version="7.2.3" targetFramework="sl50" />
<package id="IdeaBlade.DevForce.Core" version="7.2.4" targetFramework="sl50" />
<package id="Microsoft.CompilerServices.AsyncTargetingPack" version="1.0.1" targetFramework="sl50" />
</packages>
2 changes: 1 addition & 1 deletion Cocktail.Utils/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("2.4.4")]
[assembly: AssemblyVersion("2.4.5")]
Loading

0 comments on commit 53a4244

Please sign in to comment.