Skip to content

Commit f7c2011

Browse files
angularsenangularsen
committed
Merge branch 'v4-move-testapps-to-samples' into v4
2 parents 721f165 + 10b0b52 commit f7c2011

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+108
-267
lines changed

‎Samples/Samples.sln‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,104 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitConverter.Wpf", "UnitCo
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfMVVMSample", "WpfMVVMSample\WpfMVVMSample\WpfMVVMSample.csproj", "{B72F9215-70FF-4155-89BC-9A02CC550447}"
1111
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleConversionDemo.UWP.CSharp", "SimpleConversionDemo.UWP.CSharp\SimpleConversionDemo.UWP.CSharp.csproj", "{76255CC9-A854-441F-AF5C-2606509D3C5E}"
13+
EndProject
14+
Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "SimpleConversionDemo.UWP.WinJS", "SimpleConversionDemo.UWP.WinJS\SimpleConversionDemo.UWP.WinJS.jsproj", "{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}"
15+
EndProject
1216
Global
1317
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1418
Debug|Any CPU = Debug|Any CPU
19+
Debug|ARM = Debug|ARM
20+
Debug|x64 = Debug|x64
21+
Debug|x86 = Debug|x86
1522
Release|Any CPU = Release|Any CPU
23+
Release|ARM = Release|ARM
24+
Release|x64 = Release|x64
25+
Release|x86 = Release|x86
1626
EndGlobalSection
1727
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1828
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1929
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Debug|ARM.ActiveCfg = Debug|Any CPU
31+
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Debug|x64.ActiveCfg = Debug|Any CPU
32+
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Debug|x64.Build.0 = Debug|Any CPU
33+
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Debug|x86.ActiveCfg = Debug|Any CPU
34+
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Debug|x86.Build.0 = Debug|Any CPU
2035
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
2136
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Release|Any CPU.Build.0 = Release|Any CPU
37+
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Release|ARM.ActiveCfg = Release|Any CPU
38+
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Release|x64.ActiveCfg = Release|Any CPU
39+
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Release|x64.Build.0 = Release|Any CPU
40+
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Release|x86.ActiveCfg = Release|Any CPU
41+
{955A6CBF-C4E3-4C55-85C8-613E2CA4CCD7}.Release|x86.Build.0 = Release|Any CPU
2242
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2343
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Debug|ARM.ActiveCfg = Debug|Any CPU
45+
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Debug|x64.ActiveCfg = Debug|Any CPU
46+
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Debug|x64.Build.0 = Debug|Any CPU
47+
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Debug|x86.ActiveCfg = Debug|Any CPU
48+
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Debug|x86.Build.0 = Debug|Any CPU
2449
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
2550
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Release|Any CPU.Build.0 = Release|Any CPU
51+
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Release|ARM.ActiveCfg = Release|Any CPU
52+
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Release|x64.ActiveCfg = Release|Any CPU
53+
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Release|x64.Build.0 = Release|Any CPU
54+
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Release|x86.ActiveCfg = Release|Any CPU
55+
{D04EE35D-496A-4C83-A369-09B9B2BEAEEC}.Release|x86.Build.0 = Release|Any CPU
2656
{B72F9215-70FF-4155-89BC-9A02CC550447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2757
{B72F9215-70FF-4155-89BC-9A02CC550447}.Debug|Any CPU.Build.0 = Debug|Any CPU
58+
{B72F9215-70FF-4155-89BC-9A02CC550447}.Debug|ARM.ActiveCfg = Debug|Any CPU
59+
{B72F9215-70FF-4155-89BC-9A02CC550447}.Debug|x64.ActiveCfg = Debug|Any CPU
60+
{B72F9215-70FF-4155-89BC-9A02CC550447}.Debug|x64.Build.0 = Debug|Any CPU
61+
{B72F9215-70FF-4155-89BC-9A02CC550447}.Debug|x86.ActiveCfg = Debug|Any CPU
62+
{B72F9215-70FF-4155-89BC-9A02CC550447}.Debug|x86.Build.0 = Debug|Any CPU
2863
{B72F9215-70FF-4155-89BC-9A02CC550447}.Release|Any CPU.ActiveCfg = Release|Any CPU
2964
{B72F9215-70FF-4155-89BC-9A02CC550447}.Release|Any CPU.Build.0 = Release|Any CPU
65+
{B72F9215-70FF-4155-89BC-9A02CC550447}.Release|ARM.ActiveCfg = Release|Any CPU
66+
{B72F9215-70FF-4155-89BC-9A02CC550447}.Release|x64.ActiveCfg = Release|Any CPU
67+
{B72F9215-70FF-4155-89BC-9A02CC550447}.Release|x64.Build.0 = Release|Any CPU
68+
{B72F9215-70FF-4155-89BC-9A02CC550447}.Release|x86.ActiveCfg = Release|Any CPU
69+
{B72F9215-70FF-4155-89BC-9A02CC550447}.Release|x86.Build.0 = Release|Any CPU
70+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Debug|Any CPU.ActiveCfg = Debug|x86
71+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Debug|Any CPU.Build.0 = Debug|x86
72+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Debug|Any CPU.Deploy.0 = Debug|x86
73+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Debug|ARM.ActiveCfg = Debug|ARM
74+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Debug|ARM.Build.0 = Debug|ARM
75+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Debug|ARM.Deploy.0 = Debug|ARM
76+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Debug|x64.ActiveCfg = Debug|x86
77+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Debug|x86.ActiveCfg = Debug|x86
78+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Debug|x86.Build.0 = Debug|x86
79+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Debug|x86.Deploy.0 = Debug|x86
80+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Release|Any CPU.ActiveCfg = Release|x86
81+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Release|Any CPU.Build.0 = Release|x86
82+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Release|Any CPU.Deploy.0 = Release|x86
83+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Release|ARM.ActiveCfg = Release|ARM
84+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Release|ARM.Build.0 = Release|ARM
85+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Release|ARM.Deploy.0 = Release|ARM
86+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Release|x64.ActiveCfg = Release|x86
87+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Release|x86.ActiveCfg = Release|x86
88+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Release|x86.Build.0 = Release|x86
89+
{76255CC9-A854-441F-AF5C-2606509D3C5E}.Release|x86.Deploy.0 = Release|x86
90+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Debug|Any CPU.ActiveCfg = Debug|x86
91+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Debug|Any CPU.Build.0 = Debug|x86
92+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Debug|Any CPU.Deploy.0 = Debug|x86
93+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Debug|ARM.ActiveCfg = Debug|ARM
94+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Debug|ARM.Build.0 = Debug|ARM
95+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Debug|ARM.Deploy.0 = Debug|ARM
96+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Debug|x64.ActiveCfg = Debug|x86
97+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Debug|x86.ActiveCfg = Debug|x86
98+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Debug|x86.Build.0 = Debug|x86
99+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Debug|x86.Deploy.0 = Debug|x86
100+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|Any CPU.ActiveCfg = Release|x86
101+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|Any CPU.Build.0 = Release|x86
102+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|Any CPU.Deploy.0 = Release|x86
103+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|ARM.ActiveCfg = Release|ARM
104+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|ARM.Build.0 = Release|ARM
105+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|ARM.Deploy.0 = Release|ARM
106+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|x64.ActiveCfg = Release|x86
107+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|x86.ActiveCfg = Release|x86
108+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|x86.Build.0 = Release|x86
109+
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|x86.Deploy.0 = Release|x86
30110
EndGlobalSection
31111
GlobalSection(SolutionProperties) = preSolution
32112
HideSolutionNode = FALSE

‎UnitsNet.TestApps.Uwp.Csharp/.gitignore‎ renamed to ‎Samples/SimpleConversionDemo.UWP.CSharp/.gitignore‎

File renamed without changes.

‎UnitsNet.TestApps.Uwp.Csharp/App.xaml‎ renamed to ‎Samples/SimpleConversionDemo.UWP.CSharp/App.xaml‎

File renamed without changes.

‎UnitsNet.TestApps.Uwp.Csharp/App.xaml.cs‎ renamed to ‎Samples/SimpleConversionDemo.UWP.CSharp/App.xaml.cs‎

File renamed without changes.

‎UnitsNet.TestApps.Uwp.Csharp/Assets/LockScreenLogo.scale-200.png‎ renamed to ‎Samples/SimpleConversionDemo.UWP.CSharp/Assets/LockScreenLogo.scale-200.png‎

File renamed without changes.

‎UnitsNet.TestApps.Uwp.Csharp/Assets/SplashScreen.scale-200.png‎ renamed to ‎Samples/SimpleConversionDemo.UWP.CSharp/Assets/SplashScreen.scale-200.png‎

File renamed without changes.

‎UnitsNet.TestApps.Uwp.Csharp/Assets/Square150x150Logo.scale-200.png‎ renamed to ‎Samples/SimpleConversionDemo.UWP.CSharp/Assets/Square150x150Logo.scale-200.png‎

File renamed without changes.

‎UnitsNet.TestApps.Uwp.Csharp/Assets/Square44x44Logo.scale-200.png‎ renamed to ‎Samples/SimpleConversionDemo.UWP.CSharp/Assets/Square44x44Logo.scale-200.png‎

File renamed without changes.

‎UnitsNet.TestApps.Uwp.Csharp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png‎ renamed to ‎Samples/SimpleConversionDemo.UWP.CSharp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png‎

File renamed without changes.

‎UnitsNet.TestApps.Uwp.Csharp/Assets/StoreLogo.png‎ renamed to ‎Samples/SimpleConversionDemo.UWP.CSharp/Assets/StoreLogo.png‎

File renamed without changes.

0 commit comments

Comments
 (0)