Skip to content

Commit 7eefcee

Browse files
Merge branch 'feature/update_bridge' into develop
2 parents 77e70e4 + 477a560 commit 7eefcee

22 files changed

+96
-53742
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,6 @@ ModelManifest.xml
190190

191191
Bridge.Ioc.userprefs
192192
applicationhost.config
193+
.vs
194+
Bridge.Ioc/Bridge/output
195+
Bridge.Ioc.ExampleApp/Bridge/output

Bridge.Ioc.ExampleApp/Bridge.Ioc.ExampleApp.csproj

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,6 @@
3333
<WarningLevel>4</WarningLevel>
3434
<NoStdLib>true</NoStdLib>
3535
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="Bridge, Version=15.7.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\Bridge.Core.15.7.0\lib\net40\Bridge.dll</HintPath>
39-
</Reference>
40-
<Reference Include="Bridge.Html5, Version=15.7.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Bridge.Html5.15.7.0\lib\net40\Bridge.Html5.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Bridge.jQuery2, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Bridge.jQuery.2.9.3\lib\net40\Bridge.jQuery2.dll</HintPath>
45-
</Reference>
46-
</ItemGroup>
4736
<ItemGroup>
4837
<Compile Include="Abstract\ICalc.cs" />
4938
<Compile Include="Abstract\ISubtract.cs" />
@@ -61,19 +50,33 @@
6150
</ProjectReference>
6251
</ItemGroup>
6352
<ItemGroup>
53+
<None Include="bridge.json" />
6454
<None Include="Bridge\bridge.json" />
6555
<None Include="packages.config" />
6656
</ItemGroup>
6757
<ItemGroup>
68-
<Content Include="Bridge\output\readme.txt" />
6958
<Content Include="Bridge\www\demo.html" />
7059
</ItemGroup>
60+
<ItemGroup>
61+
<Folder Include="Bridge\output\" />
62+
</ItemGroup>
63+
<ItemGroup>
64+
<Reference Include="Bridge, Version=16.4.0.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\packages\Bridge.Core.16.4.1\lib\net40\Bridge.dll</HintPath>
66+
</Reference>
67+
<Reference Include="Bridge.Html5, Version=16.4.0.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>..\packages\Bridge.Html5.16.4.1\lib\net40\Bridge.Html5.dll</HintPath>
69+
</Reference>
70+
<Reference Include="Bridge.jQuery2, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>..\packages\Bridge.jQuery.2.9.4\lib\net40\Bridge.jQuery2.dll</HintPath>
72+
</Reference>
73+
</ItemGroup>
7174
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
72-
<Import Project="..\packages\Bridge.Min.15.7.0\build\Bridge.Min.targets" Condition="Exists('..\packages\Bridge.Min.15.7.0\build\Bridge.Min.targets')" />
75+
<Import Project="..\packages\Bridge.Min.16.4.1\build\Bridge.Min.targets" Condition="Exists('..\packages\Bridge.Min.16.4.1\build\Bridge.Min.targets')" />
7376
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7477
<PropertyGroup>
7578
<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>
7679
</PropertyGroup>
77-
<Error Condition="!Exists('..\packages\Bridge.Min.15.7.0\build\Bridge.Min.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Bridge.Min.15.7.0\build\Bridge.Min.targets'))" />
80+
<Error Condition="!Exists('..\packages\Bridge.Min.16.4.1\build\Bridge.Min.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Bridge.Min.16.4.1\build\Bridge.Min.targets'))" />
7881
</Target>
7982
</Project>

Bridge.Ioc.ExampleApp/Bridge/output/bridge.ioc.exampleapp.js

Lines changed: 0 additions & 127 deletions
This file was deleted.

Bridge.Ioc.ExampleApp/Bridge/output/bridge.ioc.exampleapp.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)