Skip to content

Commit d71f373

Browse files
angularsenangularsen
committed
Revert "TEMP: Samples: Use UnitsNet instead of nuget"
This reverts commit 70c00d5.
1 parent 8a4cbf5 commit d71f373

6 files changed

Lines changed: 10 additions & 32 deletions

File tree

‎Samples/ConsoleApp-NetCore/ConsoleApp-NetCore.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<Folder Include="Properties\" />
10+
<PackageReference Include="UnitsNet" Version="4.0.0-beta1" />
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<ProjectReference Include="..\..\UnitsNet\UnitsNet.csproj" />
14+
<Folder Include="Properties\" />
1515
</ItemGroup>
1616

1717
</Project>

‎Samples/Samples.sln‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleConversionDemo.UWP.CS
1313
EndProject
1414
Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "SimpleConversionDemo.UWP.WinJS", "SimpleConversionDemo.UWP.WinJS\SimpleConversionDemo.UWP.WinJS.jsproj", "{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitsNet", "..\UnitsNet\UnitsNet.csproj", "{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}"
17-
EndProject
1816
Global
1917
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2018
Debug|Any CPU = Debug|Any CPU
@@ -109,22 +107,6 @@ Global
109107
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|x86.ActiveCfg = Release|x86
110108
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|x86.Build.0 = Release|x86
111109
{F5B26152-A64B-42A8-8F19-D2EAFB94CBD1}.Release|x86.Deploy.0 = Release|x86
112-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
113-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
114-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Debug|ARM.ActiveCfg = Debug|Any CPU
115-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Debug|ARM.Build.0 = Debug|Any CPU
116-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Debug|x64.ActiveCfg = Debug|Any CPU
117-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Debug|x64.Build.0 = Debug|Any CPU
118-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Debug|x86.ActiveCfg = Debug|Any CPU
119-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Debug|x86.Build.0 = Debug|Any CPU
120-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
121-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Release|Any CPU.Build.0 = Release|Any CPU
122-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Release|ARM.ActiveCfg = Release|Any CPU
123-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Release|ARM.Build.0 = Release|Any CPU
124-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Release|x64.ActiveCfg = Release|Any CPU
125-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Release|x64.Build.0 = Release|Any CPU
126-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Release|x86.ActiveCfg = Release|Any CPU
127-
{A50F418C-55D4-4B24-87A3-AFB4B4336E1C}.Release|x86.Build.0 = Release|Any CPU
128110
EndGlobalSection
129111
GlobalSection(SolutionProperties) = preSolution
130112
HideSolutionNode = FALSE

‎Samples/UnitConverter.Wpf/UnitConverter.Wpf/UnitConverter.Wpf.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161
<Reference Include="System.Xaml">
6262
<RequiredTargetFramework>4.0</RequiredTargetFramework>
6363
</Reference>
64+
<Reference Include="UnitsNet, Version=4.0.0.0, Culture=neutral, PublicKeyToken=f8601875a1f041da, processorArchitecture=MSIL">
65+
<HintPath>..\..\packages\UnitsNet.4.0.0-beta1\lib\net40\UnitsNet.dll</HintPath>
66+
</Reference>
6467
<Reference Include="WindowsBase" />
6568
<Reference Include="PresentationCore" />
6669
<Reference Include="PresentationFramework" />
@@ -119,11 +122,5 @@
119122
<ItemGroup>
120123
<Resource Include="logo-512.ico" />
121124
</ItemGroup>
122-
<ItemGroup>
123-
<ProjectReference Include="..\..\..\UnitsNet\UnitsNet.csproj">
124-
<Project>{a50f418c-55d4-4b24-87a3-afb4b4336e1c}</Project>
125-
<Name>UnitsNet</Name>
126-
</ProjectReference>
127-
</ItemGroup>
128125
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
129126
</Project>

‎Samples/UnitConverter.Wpf/UnitConverter.Wpf/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<package id="ControlzEx" version="3.0.2.4" targetFramework="net471" />
44
<package id="MahApps.Metro" version="1.6.5" targetFramework="net471" />
55
<package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
6+
<package id="UnitsNet" version="4.0.0-beta1" targetFramework="net471" />
67
</packages>

‎Samples/WpfMVVMSample/WpfMVVMSample/WpfMVVMSample.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@
8282
<Reference Include="System.Xaml">
8383
<RequiredTargetFramework>4.0</RequiredTargetFramework>
8484
</Reference>
85+
<Reference Include="UnitsNet, Version=4.0.0.0, Culture=neutral, PublicKeyToken=f8601875a1f041da, processorArchitecture=MSIL">
86+
<HintPath>..\..\packages\UnitsNet.4.0.0-beta1\lib\net40\UnitsNet.dll</HintPath>
87+
</Reference>
8588
<Reference Include="Unity.Abstractions, Version=3.3.1.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
8689
<HintPath>..\..\packages\Unity.Abstractions.3.3.1\lib\net47\Unity.Abstractions.dll</HintPath>
8790
</Reference>
@@ -156,11 +159,5 @@
156159
<ItemGroup>
157160
<None Include="App.config" />
158161
</ItemGroup>
159-
<ItemGroup>
160-
<ProjectReference Include="..\..\..\UnitsNet\UnitsNet.csproj">
161-
<Project>{a50f418c-55d4-4b24-87a3-afb4b4336e1c}</Project>
162-
<Name>UnitsNet</Name>
163-
</ProjectReference>
164-
</ItemGroup>
165162
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
166163
</Project>

‎Samples/WpfMVVMSample/WpfMVVMSample/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<package id="System.Security.Permissions" version="4.5.0" targetFramework="net471" />
1111
<package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net471" />
1212
<package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
13+
<package id="UnitsNet" version="4.0.0-beta1" targetFramework="net471" />
1314
<package id="Unity" version="5.8.11" targetFramework="net471" />
1415
<package id="Unity.Abstractions" version="3.3.1" targetFramework="net471" />
1516
<package id="Unity.Container" version="5.8.11" targetFramework="net471" />

0 commit comments

Comments
 (0)