Skip to content

Commit 2ba8a80

Browse files
ViToniunknown-user
ViToni
authored and
unknown-user
committed
* NuGet.targets: Adjustment for NuGet and MonoDevelop on Linux.
* sdlna.csproj: * server.csproj: * thumbs.csproj: * packages.config: * fsserver.csproj: * SimpleDLNA.csproj: Adjustment of case sensitive NuGet paths on Linux. * Resources.resx: Adjustment of case sensitive resource paths on Linux. * util.csproj: Adjustment of case sensitive NuGet paths on Linux. Removing obsolete SQLite interop libraries
1 parent 060d602 commit 2ba8a80

9 files changed

Lines changed: 34 additions & 44 deletions

File tree

‎.nuget/NuGet.targets‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
55

66
<!-- Enable the restore command to run before builds -->
7-
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
7+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
88

99
<!-- Property that enables building a package from a project -->
1010
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
1111

1212
<!-- Determines if package restore consent is required to restore packages -->
13-
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
13+
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">false</RequireRestoreConsent>
1414

1515
<!-- Download NuGet.exe if it does not already exist -->
1616
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
@@ -22,6 +22,7 @@
2222
<PackageSource Include="https://nuget.org/api/v2/" />
2323
<PackageSource Include="https://my-nuget-source/nuget/" />
2424
-->
25+
<PackageSource Include="https://nuget.org/api/v2/" />
2526
</ItemGroup>
2627

2728
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
@@ -34,13 +35,13 @@
3435
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
3536
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
3637
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
37-
<PackagesConfig>packages.config</PackagesConfig>
38+
<PackagesConfig>$(ProjectDir)packages.config</PackagesConfig>
3839
<PackagesDir>$(SolutionDir)packages</PackagesDir>
3940
</PropertyGroup>
4041

4142
<PropertyGroup>
4243
<!-- NuGet command -->
43-
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
44+
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
4445
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
4546

4647
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>

‎SimpleDLNA/SimpleDLNA.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
</ProjectReference>
230230
</ItemGroup>
231231
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
232-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
232+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
233233
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
234234
Other similar extension points exist, see Microsoft.Common.targets.
235235
<Target Name="BeforeBuild">

‎fsserver/fsserver.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</ItemGroup>
102102
<ItemGroup />
103103
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
104-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
104+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
105105
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
106106
Other similar extension points exist, see Microsoft.Common.targets.
107107
<Target Name="BeforeBuild">

‎sdlna/sdlna.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
</EmbeddedResource>
157157
</ItemGroup>
158158
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
159-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
159+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
160160
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
161161
Other similar extension points exist, see Microsoft.Common.targets.
162162
<Target Name="BeforeBuild">

‎server/Properties/Resources.resx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,36 +119,36 @@
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121
<data name="browse_css" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>..\resources\browse.css;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
122+
<value>..\Resources\browse.css;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123123
</data>
124124
<data name="contentdirectory" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>..\resources\contentdirectory.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
125+
<value>..\Resources\contentdirectory.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
126126
</data>
127127
<data name="connectionmanager" type="System.Resources.ResXFileRef, System.Windows.Forms">
128-
<value>..\resources\connectionmanager.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
128+
<value>..\Resources\connectionmanager.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
129129
</data>
130130
<data name="MSMediaReceiverRegistrar" type="System.Resources.ResXFileRef, System.Windows.Forms">
131-
<value>..\resources\MSMediaReceiverRegistrar.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
131+
<value>..\Resources\MSMediaReceiverRegistrar.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
132132
</data>
133133
<data name="description" type="System.Resources.ResXFileRef, System.Windows.Forms">
134-
<value>..\resources\description.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;UTF-8</value>
134+
<value>..\Resources\description.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;UTF-8</value>
135135
</data>
136136
<data name="x_featurelist" type="System.Resources.ResXFileRef, System.Windows.Forms">
137-
<value>..\resources\x_featurelist.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
137+
<value>..\Resources\x_featurelist.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
138138
</data>
139139
<data name="favicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
140-
<value>..\resources\favicon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
140+
<value>..\Resources\favicon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
141141
</data>
142142
<data name="largePNG" type="System.Resources.ResXFileRef, System.Windows.Forms">
143-
<value>..\resources\large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
143+
<value>..\Resources\large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
144144
</data>
145145
<data name="largeJPEG" type="System.Resources.ResXFileRef, System.Windows.Forms">
146-
<value>..\resources\large.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
146+
<value>..\Resources\large.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
147147
</data>
148148
<data name="smallPNG" type="System.Resources.ResXFileRef, System.Windows.Forms">
149-
<value>..\resources\small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
149+
<value>..\Resources\small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
150150
</data>
151151
<data name="smallJPEG" type="System.Resources.ResXFileRef, System.Windows.Forms">
152-
<value>..\resources\small.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
152+
<value>..\Resources\small.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
153153
</data>
154154
</root>

‎server/server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
</ProjectReference>
189189
</ItemGroup>
190190
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
191-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
191+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
192192
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
193193
Other similar extension points exist, see Microsoft.Common.targets.
194194
<Target Name="BeforeBuild">

‎thumbs/thumbs.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<None Include="sdlna.key.snk" />
8484
</ItemGroup>
8585
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
86-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
86+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
8787
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8888
Other similar extension points exist, see Microsoft.Common.targets.
8989
<Target Name="BeforeBuild">

‎util/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="log4net" version="2.0.3" targetFramework="net40-Client" />
4-
<package id="System.Data.SQLite.Core" version="1.0.93.0" targetFramework="net40-Client" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="log4net" version="2.0.3" targetFramework="net40-Client" />
4+
<package id="System.Data.SQLite.Core" version="1.0.94.0" targetFramework="net40-Client" />
55
</packages>

‎util/util.csproj‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
86
<ProjectGuid>{A8960A7A-887C-40D7-9632-002E94BFC830}</ProjectGuid>
97
<OutputType>Library</OutputType>
108
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -42,19 +40,17 @@
4240
<AssemblyOriginatorKeyFile>sdlna.key.snk</AssemblyOriginatorKeyFile>
4341
</PropertyGroup>
4442
<ItemGroup>
45-
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
46-
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\packages\log4net.2.0.3\lib\net40-client\log4net.dll</HintPath>
48-
</Reference>
4943
<Reference Include="System" />
5044
<Reference Include="System.Core" />
51-
<Reference Include="System.Data.SQLite, Version=1.0.93.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\packages\System.Data.SQLite.Core.1.0.93.0\lib\net40\System.Data.SQLite.dll</HintPath>
54-
</Reference>
5545
<Reference Include="System.Drawing" />
5646
<Reference Include="System.Data" />
57-
<Reference Include="System.XML" />
47+
<Reference Include="System.Xml" />
48+
<Reference Include="log4net">
49+
<HintPath>..\packages\log4net.2.0.3\lib\net40-client\log4net.dll</HintPath>
50+
</Reference>
51+
<Reference Include="System.Data.SQLite">
52+
<HintPath>..\packages\System.Data.SQLite.Core.1.0.94.0\lib\net40\System.Data.SQLite.dll</HintPath>
53+
</Reference>
5854
</ItemGroup>
5955
<ItemGroup>
6056
<Compile Include="..\GlobalAssemblyInfo.cs">
@@ -92,16 +88,9 @@
9288
<None Include="packages.config" />
9389
<None Include="sdlna.key.snk" />
9490
</ItemGroup>
95-
<ItemGroup>
96-
<Content Include="x64\SQLite.Interop.dll">
97-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
98-
</Content>
99-
<Content Include="x86\SQLite.Interop.dll">
100-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
101-
</Content>
102-
</ItemGroup>
10391
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
104-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
92+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
93+
<Import Project="..\packages\System.Data.SQLite.Core.1.0.94.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.94.0\build\net40\System.Data.SQLite.Core.targets')" />
10594
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
10695
Other similar extension points exist, see Microsoft.Common.targets.
10796
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)