Skip to content

Commit 7ac7ff5

Browse files
taradinoctaradinoc
committed
Updated NuGet dependency versions.
1 parent 8e168b9 commit 7ac7ff5

File tree

9 files changed

+186
-157
lines changed

9 files changed

+186
-157
lines changed

‎Guncho.Core/Guncho.Core.csproj

+68-60
Original file line numberDiff line numberDiff line change
@@ -85,70 +85,76 @@
8585
<Prefer32Bit>false</Prefer32Bit>
8686
</PropertyGroup>
8787
<ItemGroup>
88-
<Reference Include="Microsoft.AspNet.Identity.Core">
89-
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.1.0\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
88+
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89+
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
90+
<Private>True</Private>
9091
</Reference>
91-
<Reference Include="Microsoft.AspNet.Identity.Owin">
92-
<HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.1.0\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
92+
<Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93+
<HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
94+
<Private>True</Private>
9395
</Reference>
94-
<Reference Include="Microsoft.AspNet.SignalR.Core">
95-
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.1.2\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
96+
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97+
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.2.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
98+
<Private>True</Private>
9699
</Reference>
97-
<Reference Include="Microsoft.Owin, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98-
<SpecificVersion>False</SpecificVersion>
99-
<HintPath>..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll</HintPath>
100+
<Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101+
<HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
102+
<Private>True</Private>
100103
</Reference>
101-
<Reference Include="Microsoft.Owin.Cors">
102-
<HintPath>..\packages\Microsoft.Owin.Cors.3.0.0\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
104+
<Reference Include="Microsoft.Owin.Cors, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105+
<HintPath>..\packages\Microsoft.Owin.Cors.3.0.1\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
106+
<Private>True</Private>
103107
</Reference>
104-
<Reference Include="Microsoft.Owin.Diagnostics, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105-
<SpecificVersion>False</SpecificVersion>
106-
<HintPath>..\packages\Microsoft.Owin.Diagnostics.3.0.0\lib\net45\Microsoft.Owin.Diagnostics.dll</HintPath>
108+
<Reference Include="Microsoft.Owin.Diagnostics, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109+
<HintPath>..\packages\Microsoft.Owin.Diagnostics.3.0.1\lib\net45\Microsoft.Owin.Diagnostics.dll</HintPath>
110+
<Private>True</Private>
107111
</Reference>
108-
<Reference Include="Microsoft.Owin.FileSystems">
109-
<HintPath>..\packages\Microsoft.Owin.FileSystems.3.0.0\lib\net45\Microsoft.Owin.FileSystems.dll</HintPath>
112+
<Reference Include="Microsoft.Owin.FileSystems, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113+
<HintPath>..\packages\Microsoft.Owin.FileSystems.3.0.1\lib\net45\Microsoft.Owin.FileSystems.dll</HintPath>
114+
<Private>True</Private>
110115
</Reference>
111-
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112-
<SpecificVersion>False</SpecificVersion>
113-
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.3.0.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
116+
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117+
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
118+
<Private>True</Private>
114119
</Reference>
115-
<Reference Include="Microsoft.Owin.Hosting, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
116-
<SpecificVersion>False</SpecificVersion>
117-
<HintPath>..\packages\Microsoft.Owin.Hosting.3.0.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
120+
<Reference Include="Microsoft.Owin.Hosting, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121+
<HintPath>..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
122+
<Private>True</Private>
118123
</Reference>
119-
<Reference Include="Microsoft.Owin.Security, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
120-
<SpecificVersion>False</SpecificVersion>
121-
<HintPath>..\packages\Microsoft.Owin.Security.3.0.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
124+
<Reference Include="Microsoft.Owin.Security, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125+
<HintPath>..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
126+
<Private>True</Private>
122127
</Reference>
123-
<Reference Include="Microsoft.Owin.Security.Cookies, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124-
<SpecificVersion>False</SpecificVersion>
125-
<HintPath>..\packages\Microsoft.Owin.Security.Cookies.3.0.0\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
128+
<Reference Include="Microsoft.Owin.Security.Cookies, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
129+
<HintPath>..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
130+
<Private>True</Private>
126131
</Reference>
127-
<Reference Include="Microsoft.Owin.Security.OAuth, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128-
<SpecificVersion>False</SpecificVersion>
129-
<HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.0.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
132+
<Reference Include="Microsoft.Owin.Security.OAuth, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133+
<HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
134+
<Private>True</Private>
130135
</Reference>
131-
<Reference Include="Microsoft.Owin.StaticFiles">
132-
<HintPath>..\packages\Microsoft.Owin.StaticFiles.3.0.0\lib\net45\Microsoft.Owin.StaticFiles.dll</HintPath>
136+
<Reference Include="Microsoft.Owin.StaticFiles, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137+
<HintPath>..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll</HintPath>
138+
<Private>True</Private>
133139
</Reference>
134-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
135-
<SpecificVersion>False</SpecificVersion>
136-
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
140+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
141+
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
142+
<Private>True</Private>
137143
</Reference>
138144
<Reference Include="Owin">
139145
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
140146
</Reference>
141-
<Reference Include="SimpleInjector">
142-
<HintPath>..\packages\SimpleInjector.2.6.1\lib\net45\SimpleInjector.dll</HintPath>
143-
</Reference>
144-
<Reference Include="SimpleInjector.Diagnostics">
145-
<HintPath>..\packages\SimpleInjector.2.6.1\lib\net45\SimpleInjector.Diagnostics.dll</HintPath>
147+
<Reference Include="SimpleInjector, Version=3.1.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
148+
<HintPath>..\packages\SimpleInjector.3.1.2\lib\net45\SimpleInjector.dll</HintPath>
149+
<Private>True</Private>
146150
</Reference>
147-
<Reference Include="SimpleInjector.Extensions.ExecutionContextScoping">
148-
<HintPath>..\packages\SimpleInjector.Extensions.ExecutionContextScoping.2.6.1\lib\net45\SimpleInjector.Extensions.ExecutionContextScoping.dll</HintPath>
151+
<Reference Include="SimpleInjector.Extensions.ExecutionContextScoping, Version=3.1.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
152+
<HintPath>..\packages\SimpleInjector.Extensions.ExecutionContextScoping.3.1.2\lib\net45\SimpleInjector.Extensions.ExecutionContextScoping.dll</HintPath>
153+
<Private>True</Private>
149154
</Reference>
150-
<Reference Include="SimpleInjector.Integration.WebApi">
151-
<HintPath>..\packages\SimpleInjector.Integration.WebApi.2.6.1\lib\net45\SimpleInjector.Integration.WebApi.dll</HintPath>
155+
<Reference Include="SimpleInjector.Integration.WebApi, Version=3.1.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
156+
<HintPath>..\packages\SimpleInjector.Integration.WebApi.3.1.2\lib\net45\SimpleInjector.Integration.WebApi.dll</HintPath>
157+
<Private>True</Private>
152158
</Reference>
153159
<Reference Include="System" />
154160
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -157,29 +163,31 @@
157163
</Reference>
158164
<Reference Include="System.IdentityModel" />
159165
<Reference Include="System.Net.Http" />
160-
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
161-
<SpecificVersion>False</SpecificVersion>
162-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
166+
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
167+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
168+
<Private>True</Private>
163169
</Reference>
164170
<Reference Include="System.Runtime.Remoting" />
165171
<Reference Include="System.Threading.Tasks.Dataflow, Version=4.5.24.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
166172
<SpecificVersion>False</SpecificVersion>
167173
<HintPath>..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
168174
</Reference>
169175
<Reference Include="System.Web" />
170-
<Reference Include="System.Web.Cors, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
171-
<SpecificVersion>False</SpecificVersion>
172-
<HintPath>..\packages\Microsoft.AspNet.Cors.5.2.2\lib\net45\System.Web.Cors.dll</HintPath>
176+
<Reference Include="System.Web.Cors, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
177+
<HintPath>..\packages\Microsoft.AspNet.Cors.5.2.3\lib\net45\System.Web.Cors.dll</HintPath>
178+
<Private>True</Private>
173179
</Reference>
174-
<Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
175-
<SpecificVersion>False</SpecificVersion>
176-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.2\lib\net45\System.Web.Http.dll</HintPath>
180+
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
181+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
182+
<Private>True</Private>
177183
</Reference>
178-
<Reference Include="System.Web.Http.Owin">
179-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.2\lib\net45\System.Web.Http.Owin.dll</HintPath>
184+
<Reference Include="System.Web.Http.Owin, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
185+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll</HintPath>
186+
<Private>True</Private>
180187
</Reference>
181-
<Reference Include="System.Web.Http.Tracing">
182-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Tracing.5.2.2\lib\net45\System.Web.Http.Tracing.dll</HintPath>
188+
<Reference Include="System.Web.Http.Tracing, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
189+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Tracing.5.2.3\lib\net45\System.Web.Http.Tracing.dll</HintPath>
190+
<Private>True</Private>
183191
</Reference>
184192
<Reference Include="System.Xml.Linq">
185193
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -191,8 +199,8 @@
191199
<HintPath>..\TextfyreVM.dll</HintPath>
192200
</Reference>
193201
<Reference Include="Thinktecture.IdentityModel.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
194-
<SpecificVersion>False</SpecificVersion>
195-
<HintPath>..\packages\Thinktecture.IdentityModel.Core.1.3.0\lib\net45\Thinktecture.IdentityModel.Core.dll</HintPath>
202+
<HintPath>..\packages\Thinktecture.IdentityModel.Core.1.4.0\lib\net45\Thinktecture.IdentityModel.Core.dll</HintPath>
203+
<Private>True</Private>
196204
</Reference>
197205
<Reference Include="Thinktecture.IdentityModel.Owin.ResourceAuthorization, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
198206
<SpecificVersion>False</SpecificVersion>

‎Guncho.Core/ServerRunner.cs

+15-14
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ public void Run()
9191
};
9292

9393
// register auth classes
94-
container.Register<IUserStore<ApiUser, int>, OldTimeyUserStore>();
95-
container.RegisterSingle<IPasswordHasher, OldTimeyPasswordHasher>();
96-
container.Register<UserManager<ApiUser, int>>();
94+
container.RegisterSingleton<IUserStore<ApiUser, int>, OldTimeyUserStore>();
95+
container.RegisterSingleton<IPasswordHasher, OldTimeyPasswordHasher>();
96+
container.RegisterWebApiRequest<UserManager<ApiUser, int>>();
9797
container.RegisterInitializer<UserManager<ApiUser, int>>(
9898
um =>
9999
{
100100
um.PasswordHasher = container.GetInstance<IPasswordHasher>();
101101
});
102-
container.RegisterSingle<IResourceAuthorizationManager, GunchoResourceAuthorization>();
102+
container.RegisterSingleton<IResourceAuthorizationManager, GunchoResourceAuthorization>();
103103

104104
var savedSecret = Properties.Settings.Default.WebAuthSecret;
105105
byte[] secretBytes;
@@ -117,8 +117,8 @@ public void Run()
117117
{
118118
secretBytes = Convert.FromBase64String(Properties.Settings.Default.WebAuthSecret);
119119
}
120-
container.RegisterSingle<IDataProtectionProvider>(new GunchoDataProtectionProvider(secretBytes));
121-
container.RegisterSingle<ISecureDataFormat<AuthenticationTicket>>(new GunchoTicketFormat(secretBytes));
120+
container.RegisterSingleton<IDataProtectionProvider>(new GunchoDataProtectionProvider(secretBytes));
121+
container.RegisterSingleton<ISecureDataFormat<AuthenticationTicket>>(new GunchoTicketFormat(secretBytes));
122122

123123
// register server classes
124124
var serverReg = Lifestyle.Singleton.CreateRegistration<Server>(container);
@@ -132,12 +132,13 @@ public void Run()
132132
s.ResourceAuthorizationManager = new GunchoResourceAuthorization(s, s);
133133
});
134134

135-
container.RegisterSingle<ServerConfig>(serverConfig);
136-
container.RegisterSingle<ILogger>(logger);
137-
container.RegisterSingle<IWebDependencyResolver, SimpleInjectorWebApiDependencyResolver>();
138-
container.RegisterSingle<ISignalRDependencyResolver, SimpleInjectorSignalRDependencyResolver>();
135+
container.RegisterSingleton<ServerConfig>(serverConfig);
136+
container.RegisterSingleton<ILogger>(logger);
137+
container.RegisterSingleton<IWebDependencyResolver>(new SimpleInjectorWebApiDependencyResolver(container));
138+
container.RegisterSingleton<ISignalRDependencyResolver, SimpleInjectorSignalRDependencyResolver>();
139139

140140
// register API controller classes
141+
// TODO: use container.RegisterWebApiControllers()
141142
var webApiLifestyle = new WebApiRequestLifestyle();
142143
var controllerTypes = from t in typeof(ServerRunner).Assembly.GetTypes()
143144
where !t.IsAbstract && typeof(ApiController).IsAssignableFrom(t)
@@ -148,19 +149,19 @@ public void Run()
148149
}
149150

150151
// register SignalR hub and utility classes
151-
container.RegisterSingle<ISignalRConnectionManager, SignalRConnectionManager>();
152-
container.Register<PlayHub>();
152+
container.RegisterSingleton<ISignalRConnectionManager, SignalRConnectionManager>();
153+
container.RegisterSingleton<PlayHub>();
153154

154155
// register realm factory classes
155156
var informRealmFactories = InformRealmFactory.ConstructAll(
156157
logger: logger,
157158
installationsPath: Properties.Settings.Default.NiInstallationsPath,
158159
indexOutputDir: serverConfig.IndexPath);
159-
container.RegisterAll<InformRealmFactory>(informRealmFactories);
160+
container.RegisterCollection<InformRealmFactory>(informRealmFactories);
160161

161162
var allRealmFactories = new List<RealmFactory>();
162163
allRealmFactories.AddRange(informRealmFactories);
163-
container.RegisterAll<RealmFactory>(allRealmFactories);
164+
container.RegisterCollection<RealmFactory>(allRealmFactories);
164165

165166
container.Verify();
166167

0 commit comments

Comments
 (0)