Skip to content

Commit 2e93eec

Browse files
jamesmcroftjamesmcroft
committed
Fixed issues with solution, updated NuGet packages for networking lib, and added to sample apps.
1 parent dffa144 commit 2e93eec

5 files changed

Lines changed: 45 additions & 5 deletions

File tree

‎MADE.App.Networking/MADE.App.Networking.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,12 @@
5252
</ItemGroup>
5353

5454
<ItemGroup>
55-
<PackageReference Include="docfx.console" Version="2.36.0" PrivateAssets="All" />
5655
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.5.4" PrivateAssets="All" />
5756
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
5857
</ItemGroup>
5958

6059
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0.16299' ">
61-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.4" />
60+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
6261
</ItemGroup>
6362

6463
<ItemGroup>

‎MADE.App.sln‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MADE.App.Views.Xamarin.Form
3131
EndProject
3232
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MADE.App.Views.Controls.HeaderedTextBlock", "MADE.App.Views.Controls.HeaderedTextBlock\MADE.App.Views.Controls.HeaderedTextBlock.csproj", "{0084C2B6-ECAC-478F-90E7-AB2664828223}"
3333
EndProject
34-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MADE.App.Views.Controls.HeaderedTextBlock.Forms", "MADE.App.Views.Controls.HeaderedTextBlock.Forms\MADE.App.Views.Controls.HeaderedTextBlock.Forms.csproj", "{FB636A9A-BB83-4763-8C8C-3E0D5587DBB9}"
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MADE.App.Views.Controls.HeaderedTextBlock.Forms", "MADE.App.Views.Controls.HeaderedTextBlock.Forms\MADE.App.Views.Controls.HeaderedTextBlock.Forms.csproj", "{FB636A9A-BB83-4763-8C8C-3E0D5587DBB9}"
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{8DA65C86-AAD8-4FB2-B496-62C0A7C800D2}"
3737
EndProject
@@ -43,9 +43,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MADE.Samples.Forms.iOS", "M
4343
EndProject
4444
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MADE.Samples.Forms.UWP", "MADE.Samples.Forms\MADE.Samples.Forms.UWP\MADE.Samples.Forms.UWP.csproj", "{B65F7D38-C515-4549-9FCA-05541D2F634A}"
4545
EndProject
46-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MADE.Samples.Forms", "MADE.Samples.Forms\MADE.Samples.Forms\MADE.Samples.Forms.csproj", "{B7162E54-7958-43E0-B588-02163F68883B}"
46+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MADE.Samples.Forms", "MADE.Samples.Forms\MADE.Samples.Forms\MADE.Samples.Forms.csproj", "{B7162E54-7958-43E0-B588-02163F68883B}"
4747
EndProject
48-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MADE.App.Networking", "MADE.App.Networking\MADE.App.Networking.csproj", "{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}"
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MADE.App.Networking", "MADE.App.Networking\MADE.App.Networking.csproj", "{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}"
4949
EndProject
5050
Global
5151
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -947,10 +947,38 @@ Global
947947
{B7162E54-7958-43E0-B588-02163F68883B}.Release|x64.Build.0 = Release|Any CPU
948948
{B7162E54-7958-43E0-B588-02163F68883B}.Release|x86.ActiveCfg = Release|Any CPU
949949
{B7162E54-7958-43E0-B588-02163F68883B}.Release|x86.Build.0 = Release|Any CPU
950+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
951+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
952+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
953+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
954+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
955+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
956+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
957+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
958+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
959+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|x64.Build.0 = Release|Any CPU
960+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
961+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Ad-Hoc|x86.Build.0 = Release|Any CPU
962+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
963+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|Any CPU.Build.0 = Release|Any CPU
964+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|ARM.ActiveCfg = Release|Any CPU
965+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|ARM.Build.0 = Release|Any CPU
966+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
967+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|iPhone.Build.0 = Release|Any CPU
968+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
969+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
970+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|x64.ActiveCfg = Release|Any CPU
971+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|x64.Build.0 = Release|Any CPU
972+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|x86.ActiveCfg = Release|Any CPU
973+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.AppStore|x86.Build.0 = Release|Any CPU
950974
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
951975
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|Any CPU.Build.0 = Debug|Any CPU
952976
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|ARM.ActiveCfg = Debug|Any CPU
953977
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|ARM.Build.0 = Debug|Any CPU
978+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
979+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|iPhone.Build.0 = Debug|Any CPU
980+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
981+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
954982
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|x64.ActiveCfg = Debug|Any CPU
955983
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|x64.Build.0 = Debug|Any CPU
956984
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -959,6 +987,10 @@ Global
959987
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Release|Any CPU.Build.0 = Release|Any CPU
960988
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Release|ARM.ActiveCfg = Release|Any CPU
961989
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Release|ARM.Build.0 = Release|Any CPU
990+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Release|iPhone.ActiveCfg = Release|Any CPU
991+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Release|iPhone.Build.0 = Release|Any CPU
992+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
993+
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
962994
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Release|x64.ActiveCfg = Release|Any CPU
963995
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Release|x64.Build.0 = Release|Any CPU
964996
{A509C0DD-BB0C-4624-AB74-82F4FBF5E38F}.Release|x86.ActiveCfg = Release|Any CPU

‎MADE.Samples.Android/MADE.Samples.Android.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@
8888
<Project>{ce1370ae-4985-41e2-8dce-24b11a5ea177}</Project>
8989
<Name>MADE.App.Mvvm</Name>
9090
</ProjectReference>
91+
<ProjectReference Include="..\MADE.App.Networking\MADE.App.Networking.csproj">
92+
<Project>{a509c0dd-bb0c-4624-ab74-82f4fbf5e38f}</Project>
93+
<Name>MADE.App.Networking</Name>
94+
</ProjectReference>
9195
<ProjectReference Include="..\MADE.App.Views.Controls.HeaderedTextBlock\MADE.App.Views.Controls.HeaderedTextBlock.csproj">
9296
<Project>{0084c2b6-ecac-478f-90e7-ab2664828223}</Project>
9397
<Name>MADE.App.Views.Controls.HeaderedTextBlock</Name>

‎MADE.Samples.Forms/MADE.Samples.Forms/MADE.Samples.Forms.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<ItemGroup>
1212
<ProjectReference Include="..\..\MADE.App.Design\MADE.App.Design.csproj" />
1313
<ProjectReference Include="..\..\MADE.App.Mvvm\MADE.App.Mvvm.csproj" />
14+
<ProjectReference Include="..\..\MADE.App.Networking\MADE.App.Networking.csproj" />
1415
<ProjectReference Include="..\..\MADE.App.Views.Controls.HeaderedTextBlock.Forms\MADE.App.Views.Controls.HeaderedTextBlock.Forms.csproj" />
1516
<ProjectReference Include="..\..\MADE.App.Views.Controls.HeaderedTextBlock\MADE.App.Views.Controls.HeaderedTextBlock.csproj" />
1617
<ProjectReference Include="..\..\MADE.App.Views.Navigation.MvvmLight\MADE.App.Views.Navigation.MvvmLight.csproj" />

‎MADE.Samples.Windows/MADE.Samples.Windows.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@
153153
<Project>{ce1370ae-4985-41e2-8dce-24b11a5ea177}</Project>
154154
<Name>MADE.App.Mvvm</Name>
155155
</ProjectReference>
156+
<ProjectReference Include="..\MADE.App.Networking\MADE.App.Networking.csproj">
157+
<Project>{a509c0dd-bb0c-4624-ab74-82f4fbf5e38f}</Project>
158+
<Name>MADE.App.Networking</Name>
159+
</ProjectReference>
156160
<ProjectReference Include="..\MADE.App.Views.Controls.HeaderedTextBlock\MADE.App.Views.Controls.HeaderedTextBlock.csproj">
157161
<Project>{0084c2b6-ecac-478f-90e7-ab2664828223}</Project>
158162
<Name>MADE.App.Views.Controls.HeaderedTextBlock</Name>

0 commit comments

Comments
 (0)