Skip to content

Commit 7c891dd

Browse files
RedthRedth
committed
Updated more references to submodule
1 parent f63b238 commit 7c891dd

9 files changed

+470
-106
lines changed

‎Samples/Android/Sample.Android.sln

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.9
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Android", "Sample.Android\Sample.Android.csproj", "{660D9346-D70B-4C54-8402-E5F6DF48E9AC}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.portable", "..\..\Source\ZXing.Net\zxing.portable.csproj", "{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}"
9-
EndProject
108
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.Net.Mobile.Android", "..\..\Source\ZXing.Net.Mobile.Android\ZXing.Net.Mobile.Android.csproj", "{AC17589E-C817-4FA8-B3EC-CCEB25E55E59}"
119
EndProject
1210
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.Net.Mobile.Core", "..\..\Source\ZXing.Net.Mobile.Core\ZXing.Net.Mobile.Core.csproj", "{7528DD0A-1781-47F4-ADBF-EEDDB011F6BB}"
1311
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.portable", "..\..\Source\ZXing.Net\Source\lib\zxing.portable.csproj", "{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}"
13+
EndProject
1414
Global
1515
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1616
Debug|Any CPU = Debug|Any CPU
@@ -22,10 +22,6 @@ Global
2222
{660D9346-D70B-4C54-8402-E5F6DF48E9AC}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
2323
{660D9346-D70B-4C54-8402-E5F6DF48E9AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
2424
{660D9346-D70B-4C54-8402-E5F6DF48E9AC}.Release|Any CPU.Build.0 = Release|Any CPU
25-
{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}.Release|Any CPU.Build.0 = Release|Any CPU
2925
{AC17589E-C817-4FA8-B3EC-CCEB25E55E59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3026
{AC17589E-C817-4FA8-B3EC-CCEB25E55E59}.Debug|Any CPU.Build.0 = Debug|Any CPU
3127
{AC17589E-C817-4FA8-B3EC-CCEB25E55E59}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -34,6 +30,10 @@ Global
3430
{7528DD0A-1781-47F4-ADBF-EEDDB011F6BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
3531
{7528DD0A-1781-47F4-ADBF-EEDDB011F6BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
3632
{7528DD0A-1781-47F4-ADBF-EEDDB011F6BB}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}.Release|Any CPU.Build.0 = Release|Any CPU
3737
EndGlobalSection
3838
GlobalSection(SolutionProperties) = preSolution
3939
HideSolutionNode = FALSE

‎Samples/Android/Sample.Android/Sample.Android.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
<Project>{7528DD0A-1781-47F4-ADBF-EEDDB011F6BB}</Project>
8585
<Name>ZXing.Net.Mobile.Core</Name>
8686
</ProjectReference>
87-
<ProjectReference Include="..\..\..\Source\ZXing.Net\zxing.portable.csproj">
88-
<Project>{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}</Project>
87+
<ProjectReference Include="..\..\..\Source\ZXing.Net\Source\lib\zxing.portable.csproj">
88+
<Project>{24b441f2-cbe9-4405-9fd0-72ebcbea0ec3}</Project>
8989
<Name>zxing.portable</Name>
9090
</ProjectReference>
9191
</ItemGroup>

‎Samples/WindowsPhone/Sample.WindowsPhone.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.24720.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.portable", "..\..\Source\ZXing.Net\zxing.portable.csproj", "{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.portable", "..\..\Source\ZXing.Net\Source\lib\zxing.portable.csproj", "{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.Net.Mobile.Core", "..\..\Source\ZXing.Net.Mobile.Core\ZXing.Net.Mobile.Core.csproj", "{7528DD0A-1781-47F4-ADBF-EEDDB011F6BB}"
99
EndProject

‎Samples/WindowsUniversal/Sample.WindowsUniversal.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.9
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.portable", "..\..\Source\ZXing.Net\zxing.portable.csproj", "{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.portable", "..\..\Source\ZXing.Net\Source\lib\zxing.portable.csproj", "{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.Net.Mobile.Core", "..\..\Source\ZXing.Net.Mobile.Core\ZXing.Net.Mobile.Core.csproj", "{7528DD0A-1781-47F4-ADBF-EEDDB011F6BB}"
99
EndProject

‎Samples/iOS/Sample.iOS.sln

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.9
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.iOS", "Sample.iOS\Sample.iOS.csproj", "{D119965B-BA8F-40D7-86B4-E9654E1014E2}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.portable", "..\..\Source\ZXing.Net\zxing.portable.csproj", "{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.portable", "..\..\Source\ZXing.Net\Source\lib\zxing.portable.csproj", "{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.Net.Mobile.Core", "..\..\Source\ZXing.Net.Mobile.Core\ZXing.Net.Mobile.Core.csproj", "{7528DD0A-1781-47F4-ADBF-EEDDB011F6BB}"
1111
EndProject
@@ -117,11 +117,11 @@ Global
117117
{6CBD1DF3-1FD3-4F20-80A2-A0C7414C411A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
118118
{6CBD1DF3-1FD3-4F20-80A2-A0C7414C411A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
119119
{6CBD1DF3-1FD3-4F20-80A2-A0C7414C411A}.Release|Any CPU.ActiveCfg = Release|iPhone
120+
{6CBD1DF3-1FD3-4F20-80A2-A0C7414C411A}.Release|Any CPU.Build.0 = Release|iPhone
120121
{6CBD1DF3-1FD3-4F20-80A2-A0C7414C411A}.Release|iPhone.ActiveCfg = Release|iPhone
121122
{6CBD1DF3-1FD3-4F20-80A2-A0C7414C411A}.Release|iPhone.Build.0 = Release|iPhone
122123
{6CBD1DF3-1FD3-4F20-80A2-A0C7414C411A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
123124
{6CBD1DF3-1FD3-4F20-80A2-A0C7414C411A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
124-
{6CBD1DF3-1FD3-4F20-80A2-A0C7414C411A}.Release|Any CPU.Build.0 = Release|iPhone
125125
EndGlobalSection
126126
GlobalSection(SolutionProperties) = preSolution
127127
HideSolutionNode = FALSE

‎Samples/iOS/Sample.iOS/Sample.iOS.csproj

+39-13
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,45 @@
129129
</ItemGroup>
130130
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
131131
<ItemGroup>
132-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json" />
133-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-40.png" />
134-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-40%402x.png" />
135-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-40%403x.png" />
136-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-60%402x.png" />
137-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-60%403x.png" />
138-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-76.png" />
139-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-76%402x.png" />
140-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-83.5%402x.png" />
141-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small.png" />
142-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small%402x.png" />
143-
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small%403x.png" />
144-
<ImageAsset Include="Resources\Images.xcassets\LaunchImage.launchimage\Contents.json" />
132+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json">
133+
<InProject>false</InProject>
134+
</ImageAsset>
135+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-40.png">
136+
<InProject>false</InProject>
137+
</ImageAsset>
138+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-40%402x.png">
139+
<InProject>false</InProject>
140+
</ImageAsset>
141+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-40%403x.png">
142+
<InProject>false</InProject>
143+
</ImageAsset>
144+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-60%402x.png">
145+
<InProject>false</InProject>
146+
</ImageAsset>
147+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-60%403x.png">
148+
<InProject>false</InProject>
149+
</ImageAsset>
150+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-76.png">
151+
<InProject>false</InProject>
152+
</ImageAsset>
153+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-76%402x.png">
154+
<InProject>false</InProject>
155+
</ImageAsset>
156+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-83.5%402x.png">
157+
<InProject>false</InProject>
158+
</ImageAsset>
159+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small.png">
160+
<InProject>false</InProject>
161+
</ImageAsset>
162+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small%402x.png">
163+
<InProject>false</InProject>
164+
</ImageAsset>
165+
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small%403x.png">
166+
<InProject>false</InProject>
167+
</ImageAsset>
168+
<ImageAsset Include="Resources\Images.xcassets\LaunchImage.launchimage\Contents.json">
169+
<InProject>false</InProject>
170+
</ImageAsset>
145171
</ItemGroup>
146172
<ItemGroup>
147173
<InterfaceDefinition Include="LaunchScreen.xib" />

‎ZXing.Net.Mobile.Forms.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.9
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2DC0C8D5-DF7F-4D96-886D-D7E83522C9BF}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.portable", "Source\ZXing.Net\zxing.portable.csproj", "{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.portable", "Source\ZXing.Net\Source\lib\zxing.portable.csproj", "{24B441F2-CBE9-4405-9FD0-72EBCBEA0EC3}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.Net.Mobile.Android", "Source\ZXing.Net.Mobile.Android\ZXing.Net.Mobile.Android.csproj", "{AC17589E-C817-4FA8-B3EC-CCEB25E55E59}"
1111
EndProject

0 commit comments

Comments
 (0)