Skip to content

Commit 9288bb3

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 5abd8b4 commit 9288bb3

File tree

5 files changed

+79
-26
lines changed

5 files changed

+79
-26
lines changed

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

Lines changed: 52 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,63 @@
5050
<HintPath>..\packages\Microsoft.Configuration.ConfigurationBuilders.UserSecrets.1.0.2\lib\Net471\Microsoft.Configuration.ConfigurationBuilders.UserSecrets.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.CSharp" />
53+
<Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Microsoft.VisualStudio.Validation.15.5.31\lib\netstandard2.0\Microsoft.VisualStudio.Validation.dll</HintPath>
55+
</Reference>
56+
<Reference Include="OnTopic, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\packages\OnTopic.4.0.0-alpha.2\lib\netstandard2.0\OnTopic.dll</HintPath>
58+
</Reference>
59+
<Reference Include="OnTopic.Data.Caching, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
60+
<HintPath>..\packages\OnTopic.Data.Caching.4.0.0-alpha.2\lib\netstandard2.0\OnTopic.Data.Caching.dll</HintPath>
61+
</Reference>
62+
<Reference Include="OnTopic.Data.Sql, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
63+
<HintPath>..\packages\OnTopic.Data.Sql.4.0.0-alpha.2\lib\netstandard2.0\OnTopic.Data.Sql.dll</HintPath>
64+
</Reference>
65+
<Reference Include="OnTopic.ViewModels, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\packages\OnTopic.ViewModels.4.0.0-alpha.2\lib\netstandard2.0\OnTopic.ViewModels.dll</HintPath>
67+
</Reference>
5368
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
54-
<HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
69+
<HintPath>..\packages\System.ComponentModel.Annotations.4.6.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
5570
</Reference>
71+
<Reference Include="System.ComponentModel.Composition" />
5672
<Reference Include="System.Data.SqlClient, Version=4.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5773
<HintPath>..\packages\System.Data.SqlClient.4.7.0\lib\net461\System.Data.SqlClient.dll</HintPath>
5874
</Reference>
75+
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
76+
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
77+
<Private>True</Private>
78+
<Private>True</Private>
79+
</Reference>
80+
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81+
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
82+
<Private>True</Private>
83+
<Private>True</Private>
84+
</Reference>
85+
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86+
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
87+
<Private>True</Private>
88+
<Private>True</Private>
89+
</Reference>
90+
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
91+
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
92+
<Private>True</Private>
93+
<Private>True</Private>
94+
</Reference>
95+
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
96+
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
97+
<Private>True</Private>
98+
<Private>True</Private>
99+
</Reference>
100+
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
101+
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
102+
<Private>True</Private>
103+
<Private>True</Private>
104+
</Reference>
105+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
106+
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
107+
<Private>True</Private>
108+
<Private>True</Private>
109+
</Reference>
59110
<Reference Include="System.Web.DynamicData" />
60111
<Reference Include="System.Web.Entity" />
61112
<Reference Include="System.Web.ApplicationServices" />
@@ -145,26 +196,10 @@
145196
<Folder Include="Models\" />
146197
</ItemGroup>
147198
<ItemGroup>
148-
<ProjectReference Include="..\OnTopic.Data.Caching\OnTopic.Data.Caching.csproj">
149-
<Project>{206b7f91-ca25-4e9d-9576-60d2e54a2c0a}</Project>
150-
<Name>OnTopic.Data.Caching</Name>
151-
</ProjectReference>
152-
<ProjectReference Include="..\OnTopic.Data.Sql\OnTopic.Data.Sql.csproj">
153-
<Project>{1de1f923-c7c2-435b-b49a-975acbcb5ff0}</Project>
154-
<Name>OnTopic.Data.Sql</Name>
155-
</ProjectReference>
156-
<ProjectReference Include="..\OnTopic.ViewModels\OnTopic.ViewModels.csproj">
157-
<Project>{e52fc633-b4c5-4a2b-8caf-30e756d7a6a7}</Project>
158-
<Name>OnTopic.ViewModels</Name>
159-
</ProjectReference>
160199
<ProjectReference Include="..\OnTopic.Web.Mvc\OnTopic.Web.Mvc.csproj">
161200
<Project>{3b3ce34d-b5e5-47ca-bfef-e6740650f378}</Project>
162201
<Name>OnTopic.Web.Mvc</Name>
163202
</ProjectReference>
164-
<ProjectReference Include="..\OnTopic\OnTopic.csproj">
165-
<Project>{b8d5b290-4451-4c3b-ae9e-0ff075958a74}</Project>
166-
<Name>OnTopic</Name>
167-
</ProjectReference>
168203
</ItemGroup>
169204
<PropertyGroup>
170205
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

‎OnTopic.Web.Mvc.Host/Web.config‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
For more information on how to configure your ASP.NET application, please visit
44
https://go.microsoft.com/fwlink/?LinkId=301880
@@ -30,6 +30,10 @@
3030
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
3131
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
3232
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
36+
</dependentAssembly>
3337
</assemblyBinding>
3438
</runtime>
3539

‎OnTopic.Web.Mvc.Host/packages.config‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,22 @@
66
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
77
<package id="Microsoft.Configuration.ConfigurationBuilders.Base" version="1.0.1" targetFramework="net48" />
88
<package id="Microsoft.Configuration.ConfigurationBuilders.UserSecrets" version="1.0.2" targetFramework="net48" />
9+
<package id="Microsoft.CSharp" version="4.6.0" targetFramework="net48" />
10+
<package id="Microsoft.VisualStudio.Validation" version="15.5.31" targetFramework="net48" />
911
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
10-
<package id="System.ComponentModel.Annotations" version="4.1" targetFramework="net48" />
12+
<package id="OnTopic" version="4.0.0-alpha.2" targetFramework="net48" />
13+
<package id="OnTopic.Data.Caching" version="4.0.0-alpha.2" targetFramework="net48" />
14+
<package id="OnTopic.Data.Sql" version="4.0.0-alpha.2" targetFramework="net48" />
15+
<package id="OnTopic.ViewModels" version="4.0.0-alpha.2" targetFramework="net48" />
16+
<package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net48" />
17+
<package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net48" />
1118
<package id="System.Data.SqlClient" version="4.7.0" targetFramework="net48" />
19+
<package id="System.IO" version="4.3.0" targetFramework="net48" />
1220
<package id="System.Linq" version="4.3.0" targetFramework="net47" />
21+
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
22+
<package id="System.Runtime" version="4.3.0" targetFramework="net48" />
23+
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net48" />
24+
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
25+
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
26+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net48" />
1327
</packages>

‎OnTopic.Web.Mvc.Tests/OnTopic.Web.Mvc.Tests.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
3939
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
4040
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
41+
<PackageReference Include="OnTopic" Version="4.0.0-alpha.2" />
42+
<PackageReference Include="OnTopic.Data.Caching" Version="4.0.0-alpha.2" />
43+
<PackageReference Include="OnTopic.Data.Sql" Version="4.0.0-alpha.2" />
44+
<PackageReference Include="OnTopic.TestDoubles" Version="4.0.0-alpha.2" />
45+
<PackageReference Include="OnTopic.ViewModels" Version="4.0.0-alpha.2" />
4146
</ItemGroup>
4247
<ItemGroup>
4348
<Reference Include="System.ComponentModel.DataAnnotations">
@@ -46,10 +51,6 @@
4651
<Reference Include="System.Web" />
4752
</ItemGroup>
4853
<ItemGroup>
49-
<ProjectReference Include="..\OnTopic.Data.Caching\OnTopic.Data.Caching.csproj" />
50-
<ProjectReference Include="..\OnTopic.TestDoubles\OnTopic.TestDoubles.csproj" />
51-
<ProjectReference Include="..\OnTopic.ViewModels\OnTopic.ViewModels.csproj" />
5254
<ProjectReference Include="..\OnTopic.Web.Mvc\OnTopic.Web.Mvc.csproj" />
53-
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
5455
</ItemGroup>
5556
</Project>

‎OnTopic.Web.Mvc/OnTopic.Web.Mvc.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4242
</PackageReference>
4343
<PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
44+
<PackageReference Include="OnTopic" Version="4.0.0-alpha.2" />
45+
<PackageReference Include="OnTopic.ViewModels" Version="4.0.0-alpha.2" />
4446
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="2.9.1">
4547
<PrivateAssets>all</PrivateAssets>
4648
</PackageReference>
@@ -51,9 +53,6 @@
5153
<Reference Include="Microsoft.CSharp" />
5254
<Reference Include="System.Net.Http" />
5355
</ItemGroup>
54-
<ItemGroup>
55-
<ProjectReference Include="..\OnTopic\OnTopic.csproj" />
56-
</ItemGroup>
5756
<ItemGroup>
5857
<None Include="README.md" />
5958
</ItemGroup>

0 commit comments

Comments
 (0)