Skip to content

Commit e3d585f

Browse files
JeremyCaneyJeremyCaney
committed
Migrate project references to *NuGet* references
Previously, this repository was part of the `Topics-Library` (soon to be `OnTopic-Library`) repository. As it has been split off, however, the `csproj`, `packages.config`, and `web.config` should no longer maintain local references the main library projects. Instead, those have been replaced with references to the **NuGet** packages. These bring with them a number of additional dependencies.
1 parent 27cf0b3 commit e3d585f

File tree

4 files changed

+77
-21
lines changed

4 files changed

+77
-21
lines changed

‎OnTopic.Web.Host/OnTopic.Web.Host.csproj‎

Lines changed: 51 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,61 @@
4343
<WarningLevel>4</WarningLevel>
4444
</PropertyGroup>
4545
<ItemGroup>
46+
<Reference Include="OnTopic, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\OnTopic.4.0.0-alpha.1\lib\netstandard2.0\OnTopic.dll</HintPath>
48+
</Reference>
49+
<Reference Include="OnTopic.Data.Caching, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\packages\OnTopic.Data.Caching.4.0.0-alpha.1\lib\netstandard2.0\OnTopic.Data.Caching.dll</HintPath>
51+
</Reference>
52+
<Reference Include="OnTopic.Data.Sql, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\packages\OnTopic.Data.Sql.4.0.0-alpha.1\lib\netstandard2.0\OnTopic.Data.Sql.dll</HintPath>
54+
</Reference>
4655
<Reference Include="Microsoft.CSharp" />
56+
<Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Microsoft.VisualStudio.Validation.15.5.31\lib\netstandard2.0\Microsoft.VisualStudio.Validation.dll</HintPath>
58+
</Reference>
59+
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
60+
<HintPath>..\packages\System.ComponentModel.Annotations.4.6.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
61+
</Reference>
62+
<Reference Include="System.ComponentModel.Composition" />
4763
<Reference Include="System.Data.SqlClient, Version=4.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
4864
<HintPath>..\packages\System.Data.SqlClient.4.7.0\lib\net461\System.Data.SqlClient.dll</HintPath>
4965
</Reference>
66+
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67+
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
68+
<Private>True</Private>
69+
<Private>True</Private>
70+
</Reference>
71+
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
72+
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
73+
<Private>True</Private>
74+
<Private>True</Private>
75+
</Reference>
76+
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
77+
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
78+
<Private>True</Private>
79+
<Private>True</Private>
80+
</Reference>
81+
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
82+
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
83+
<Private>True</Private>
84+
<Private>True</Private>
85+
</Reference>
86+
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
87+
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
88+
<Private>True</Private>
89+
<Private>True</Private>
90+
</Reference>
91+
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
92+
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
93+
<Private>True</Private>
94+
<Private>True</Private>
95+
</Reference>
96+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
97+
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
98+
<Private>True</Private>
99+
<Private>True</Private>
100+
</Reference>
50101
<Reference Include="System.Web.DynamicData" />
51102
<Reference Include="System.Web.Entity" />
52103
<Reference Include="System.Web.ApplicationServices" />
@@ -104,22 +155,10 @@
104155
<Folder Include="Models\" />
105156
</ItemGroup>
106157
<ItemGroup>
107-
<ProjectReference Include="..\OnTopic.Data.Caching\OnTopic.Data.Caching.csproj">
108-
<Project>{206b7f91-ca25-4e9d-9576-60d2e54a2c0a}</Project>
109-
<Name>OnTopic.Data.Caching</Name>
110-
</ProjectReference>
111-
<ProjectReference Include="..\OnTopic.Data.Sql\OnTopic.Data.Sql.csproj">
112-
<Project>{1de1f923-c7c2-435b-b49a-975acbcb5ff0}</Project>
113-
<Name>OnTopic.Data.Sql</Name>
114-
</ProjectReference>
115158
<ProjectReference Include="..\OnTopic.Web\OnTopic.Web.csproj">
116159
<Project>{c98f7b48-a085-4394-b820-c244f23868ce}</Project>
117160
<Name>OnTopic.Web</Name>
118161
</ProjectReference>
119-
<ProjectReference Include="..\OnTopic\OnTopic.csproj">
120-
<Project>{b8d5b290-4451-4c3b-ae9e-0ff075958a74}</Project>
121-
<Name>OnTopic</Name>
122-
</ProjectReference>
123162
</ItemGroup>
124163
<PropertyGroup>
125164
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

‎OnTopic.Web.Host/Web.config‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,18 @@
2929

3030
<system.codedom>
3131
<compilers>
32-
<compiler language="c#;cs;csharp" extension=".cs"
33-
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
34-
warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
35-
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
36-
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
37-
warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
32+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
33+
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
3834
</compilers>
3935
</system.codedom>
4036

37+
<runtime>
38+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
39+
<dependentAssembly>
40+
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
41+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
42+
</dependentAssembly>
43+
</assemblyBinding>
44+
</runtime>
45+
4146
</configuration>

‎OnTopic.Web.Host/packages.config‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="OnTopic" version="4.0.0-alpha.1" targetFramework="net48" />
4+
<package id="OnTopic.Data.Caching" version="4.0.0-alpha.1" targetFramework="net48" />
5+
<package id="OnTopic.Data.Sql" version="4.0.0-alpha.1" targetFramework="net48" />
36
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
7+
<package id="Microsoft.CSharp" version="4.6.0" targetFramework="net48" />
8+
<package id="Microsoft.VisualStudio.Validation" version="15.5.31" targetFramework="net48" />
9+
<package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net48" />
10+
<package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net48" />
411
<package id="System.Data.SqlClient" version="4.7.0" targetFramework="net48" />
12+
<package id="System.IO" version="4.3.0" targetFramework="net48" />
13+
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
14+
<package id="System.Runtime" version="4.3.0" targetFramework="net48" />
15+
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net48" />
16+
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
17+
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
18+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net48" />
519
</packages>

‎OnTopic.Web/OnTopic.Web.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<NoWarn>CS0618,CA1010,CA1056,CA1065;CA1303</NoWarn>
3030
</PropertyGroup>
3131
<ItemGroup>
32+
<PackageReference Include="OnTopic" Version="4.0.0-alpha.1"></PackageReference>
3233
<PackageReference Include="GitVersionTask" Version="5.0.1">
3334
<PrivateAssets>all</PrivateAssets>
3435
</PackageReference>
@@ -58,7 +59,4 @@
5859
<SubType>ASPXCodeBehind</SubType>
5960
</Compile>
6061
</ItemGroup>
61-
<ItemGroup>
62-
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
63-
</ItemGroup>
6462
</Project>

0 commit comments

Comments
 (0)