Skip to content

Commit 34c19ee

Browse files
PeterVermontPeterVermont
committedJul 7, 2016
Moved Caliper dlls up one level and changed DaySim and DaySim.Framework to reference the same copy.
Added back Release configuration
1 parent c511e5b commit 34c19ee

10 files changed

+28
-28
lines changed
 

‎Daysim.Framework/CaliperMTXNet64.dll ‎CaliperMTXNet64.dll

File renamed without changes.

‎Daysim.Framework/CaliperMtxS.dll ‎CaliperMtxS.dll

File renamed without changes.

‎Daysim.Framework/Daysim.Framework.csproj

+6-11
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@
4242
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4343
</PropertyGroup>
4444
<ItemGroup>
45-
<Reference Include="CaliperMTXNet64, Version=6.0.0.0, Culture=neutral, PublicKeyToken=f4267c1cea718a61, processorArchitecture=AMD64">
46-
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\..\..\..\Desktop\GISDK\CaliperMTXNet64.dll</HintPath>
45+
<Reference Include="CaliperMTXNet64">
46+
<HintPath>..\CaliperMTXNet64.dll</HintPath>
4847
</Reference>
4948
<Reference Include="HDF5DotNet, Version=1.8.9.0, Culture=neutral, PublicKeyToken=a4952c8df86d6e8c, processorArchitecture=AMD64">
5049
<HintPath>..\packages\HDF5DotNet.x64.1.8.9\lib\Net40\HDF5DotNet.dll</HintPath>
@@ -284,16 +283,12 @@
284283
<Compile Include="ShadowPricing\IShadowPriceParcel.cs" />
285284
</ItemGroup>
286285
<ItemGroup>
287-
<Content Include="CaliperMTXNet64.dll">
288-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
289-
</Content>
290-
<Content Include="CaliperMtxS.dll">
291-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
292-
</Content>
293-
<Content Include="FodyWeavers.xml" />
286+
<None Include="packages.config" />
294287
</ItemGroup>
295288
<ItemGroup>
296-
<None Include="packages.config" />
289+
<Content Include="..\CaliperMtxS.dll">
290+
<Link>CaliperMtxS.dll</Link>
291+
</Content>
297292
</ItemGroup>
298293
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
299294
<Import Project="..\packages\GitVersionTask.3.5.4\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.5.4\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" />

‎Daysim.Framework/FodyWeavers.xml

-4
This file was deleted.

‎Daysim.sln

+17-1
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 14
4-
VisualStudioVersion = 14.0.25123.0
4+
VisualStudioVersion = 14.0.25402.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daysim", "Daysim\Daysim.csproj", "{C89E2003-E353-43B8-BF0A-9A821945933A}"
77
EndProject
@@ -19,15 +19,31 @@ EndProject
1919
Global
2020
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2121
Debug|x64 = Debug|x64
22+
Release|x64 = Release|x64
2223
EndGlobalSection
2324
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2425
{C89E2003-E353-43B8-BF0A-9A821945933A}.Debug|x64.ActiveCfg = Debug|x64
2526
{C89E2003-E353-43B8-BF0A-9A821945933A}.Debug|x64.Build.0 = Debug|x64
27+
{C89E2003-E353-43B8-BF0A-9A821945933A}.Debug|x64.Deploy.0 = Debug|x64
28+
{C89E2003-E353-43B8-BF0A-9A821945933A}.Release|x64.ActiveCfg = Release|x64
29+
{C89E2003-E353-43B8-BF0A-9A821945933A}.Release|x64.Build.0 = Release|x64
30+
{C89E2003-E353-43B8-BF0A-9A821945933A}.Release|x64.Deploy.0 = Release|x64
2631
{33842B3A-A2CB-4B61-933B-811CED8CF74B}.Debug|x64.ActiveCfg = Debug|x64
2732
{33842B3A-A2CB-4B61-933B-811CED8CF74B}.Debug|x64.Build.0 = Debug|x64
33+
{33842B3A-A2CB-4B61-933B-811CED8CF74B}.Debug|x64.Deploy.0 = Debug|x64
34+
{33842B3A-A2CB-4B61-933B-811CED8CF74B}.Release|x64.ActiveCfg = Release|x64
35+
{33842B3A-A2CB-4B61-933B-811CED8CF74B}.Release|x64.Build.0 = Release|x64
36+
{33842B3A-A2CB-4B61-933B-811CED8CF74B}.Release|x64.Deploy.0 = Release|x64
2837
{FB158352-2310-4E0F-84E2-50EFFF669C55}.Debug|x64.ActiveCfg = Debug|x64
2938
{FB158352-2310-4E0F-84E2-50EFFF669C55}.Debug|x64.Build.0 = Debug|x64
39+
{FB158352-2310-4E0F-84E2-50EFFF669C55}.Debug|x64.Deploy.0 = Debug|x64
40+
{FB158352-2310-4E0F-84E2-50EFFF669C55}.Release|x64.ActiveCfg = Release|x64
41+
{FB158352-2310-4E0F-84E2-50EFFF669C55}.Release|x64.Build.0 = Release|x64
42+
{FB158352-2310-4E0F-84E2-50EFFF669C55}.Release|x64.Deploy.0 = Release|x64
3043
{66B71A86-D772-4A33-B182-760B912CD7F3}.Debug|x64.ActiveCfg = Debug|Any CPU
44+
{66B71A86-D772-4A33-B182-760B912CD7F3}.Release|x64.ActiveCfg = Release|Any CPU
45+
{66B71A86-D772-4A33-B182-760B912CD7F3}.Release|x64.Build.0 = Release|Any CPU
46+
{66B71A86-D772-4A33-B182-760B912CD7F3}.Release|x64.Deploy.0 = Release|Any CPU
3147
EndGlobalSection
3248
GlobalSection(SolutionProperties) = preSolution
3349
HideSolutionNode = FALSE

‎Daysim/CaliperMTXNet64.dll

-56.5 KB
Binary file not shown.

‎Daysim/CaliperMtxS.dll

-413 KB
Binary file not shown.

‎Daysim/Daysim.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
<StartupObject />
7272
</PropertyGroup>
7373
<ItemGroup>
74+
<Reference Include="CaliperMTXNet64">
75+
<HintPath>..\CaliperMTXNet64.dll</HintPath>
76+
</Reference>
7477
<Reference Include="HDF5DotNet, Version=1.8.9.0, Culture=neutral, PublicKeyToken=a4952c8df86d6e8c, processorArchitecture=AMD64">
7578
<HintPath>..\packages\HDF5DotNet.x64.1.8.9\lib\Net40\HDF5DotNet.dll</HintPath>
7679
<Private>True</Private>
@@ -394,11 +397,8 @@
394397
</Compile>
395398
</ItemGroup>
396399
<ItemGroup>
397-
<Content Include="CaliperMTXNet64.dll">
398-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
399-
</Content>
400-
<Content Include="CaliperMtxS.dll">
401-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
400+
<Content Include="..\CaliperMtxS.dll">
401+
<Link>CaliperMtxS.dll</Link>
402402
</Content>
403403
<Content Include="COPYING">
404404
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎DaysimController/DaysimController.csproj

-3
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@
128128
<None Include="packages.config" />
129129
<None Include="Properties\app.manifest" />
130130
</ItemGroup>
131-
<ItemGroup>
132-
<Content Include="FodyWeavers.xml" />
133-
</ItemGroup>
134131
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
135132
<Import Project="..\packages\GitVersionTask.3.5.4\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.5.4\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" />
136133
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎DaysimController/FodyWeavers.xml

-4
This file was deleted.

0 commit comments

Comments
 (0)