Skip to content

Commit e3ea9fb

Browse files
BrennanConroyBrennanConroy
committed
fixups
1 parent 650081c commit e3ea9fb

File tree

10 files changed

+50
-40
lines changed

10 files changed

+50
-40
lines changed

‎src/Hosting/TestHost/test/Microsoft.AspNetCore.TestHost.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5-
<NoWarn>$(NoWarn);ASPDEPR008</NoWarn>
65
</PropertyGroup>
76

87
<ItemGroup>

‎src/Hosting/TestHost/test/TestServerTests.cs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ public void CreateWithDelegate()
9393
// Arrange
9494
// Act & Assert (Does not throw)
9595
#pragma warning disable ASPDEPR004 // Type or member is obsolete
96-
#pragma warning disable CS0618 // Type or member is obsolete
96+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
9797
new TestServer(new WebHostBuilder().Configure(app => { }));
98-
#pragma warning restore CS0618 // Type or member is obsolete
98+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
9999
#pragma warning restore ASPDEPR004 // Type or member is obsolete
100100
}
101101

@@ -123,9 +123,9 @@ public void DoesNotCaptureStartupErrorsByDefault()
123123
throw new InvalidOperationException();
124124
});
125125

126-
#pragma warning disable CS0618 // Type or member is obsolete
126+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
127127
Assert.Throws<InvalidOperationException>(() => new TestServer(builder));
128-
#pragma warning restore CS0618 // Type or member is obsolete
128+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
129129
#pragma warning restore ASPDEPR004 // Type or member is obsolete
130130
}
131131

@@ -139,9 +139,9 @@ public async Task ServicesCanBeOverridenForTestingAsync()
139139
.ConfigureTestServices(services => services.AddSingleton(new SimpleService { Message = "OverridesConfigureServices" }))
140140
.ConfigureTestContainer<ThirdPartyContainer>(container => container.Services.AddSingleton(new TestService { Message = "OverridesConfigureContainer" }));
141141

142-
#pragma warning disable CS0618 // Type or member is obsolete
142+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
143143
var host = new TestServer(builder);
144-
#pragma warning restore CS0618 // Type or member is obsolete
144+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
145145
#pragma warning restore ASPDEPR004 // Type or member is obsolete
146146

147147
var response = await host.CreateClient().GetStringAsync("/");
@@ -185,10 +185,10 @@ public void CaptureStartupErrorsSettingPreserved()
185185
throw new InvalidOperationException();
186186
});
187187

188-
#pragma warning disable CS0618 // Type or member is obsolete
188+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
189189
// Does not throw
190190
new TestServer(builder);
191-
#pragma warning restore CS0618 // Type or member is obsolete
191+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
192192
#pragma warning restore ASPDEPR004 // Type or member is obsolete
193193
}
194194

@@ -203,12 +203,12 @@ public void ApplicationServicesAvailableFromTestServer()
203203
{
204204
services.AddSingleton(testService);
205205
});
206-
#pragma warning disable CS0618 // Type or member is obsolete
206+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
207207
var server = new TestServer(builder);
208208
#pragma warning restore ASPDEPR004 // Type or member is obsolete
209209

210210
Assert.Equal(testService, server.Host.Services.GetRequiredService<TestService>());
211-
#pragma warning restore CS0618 // Type or member is obsolete
211+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
212212
}
213213

214214
[Fact]
@@ -314,9 +314,9 @@ public async Task CustomServiceProviderSetsApplicationServices()
314314
{
315315
#pragma warning disable ASPDEPR004 // Type or member is obsolete
316316
var builder = new WebHostBuilder().UseStartup<CustomContainerStartup>();
317-
#pragma warning disable CS0618 // Type or member is obsolete
317+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
318318
var server = new TestServer(builder);
319-
#pragma warning restore CS0618 // Type or member is obsolete
319+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
320320
#pragma warning restore ASPDEPR004 // Type or member is obsolete
321321
string result = await server.CreateClient().GetStringAsync("/path");
322322
Assert.Equal("ApplicationServicesEqual:True", result);
@@ -341,9 +341,9 @@ public void TestServerConstructorWithFeatureCollectionAllowsInitializingServerFe
341341
featureCollection.Set<IServerAddressesFeature>(new ServerAddressesFeature());
342342

343343
// Act
344-
#pragma warning disable CS0618 // Type or member is obsolete
344+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
345345
new TestServer(builder, featureCollection);
346-
#pragma warning restore CS0618 // Type or member is obsolete
346+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
347347

348348
// Assert
349349
// Is inside configure callback
@@ -362,9 +362,9 @@ public void TestServerConstructedWithoutFeatureCollectionHasServerAddressesFeatu
362362
});
363363

364364
// Act
365-
#pragma warning disable CS0618 // Type or member is obsolete
365+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
366366
new TestServer(builder);
367-
#pragma warning restore CS0618 // Type or member is obsolete
367+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
368368
#pragma warning restore ASPDEPR004 // Type or member is obsolete
369369

370370
// Assert
@@ -378,9 +378,9 @@ public void TestServerConstructorWithNullFeatureCollectionThrows()
378378
var builder = new WebHostBuilder()
379379
.Configure(b => { });
380380

381-
#pragma warning disable CS0618 // Type or member is obsolete
381+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
382382
Assert.Throws<ArgumentNullException>(() => new TestServer(builder, null));
383-
#pragma warning restore CS0618 // Type or member is obsolete
383+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
384384
#pragma warning restore ASPDEPR004 // Type or member is obsolete
385385
}
386386

@@ -408,9 +408,9 @@ public void TestServerConstructorShouldProvideServicesFromWebHost()
408408
.Configure(_ => { });
409409

410410
// Act
411-
#pragma warning disable CS0618 // Type or member is obsolete
411+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
412412
var testServer = new TestServer(builder);
413-
#pragma warning restore CS0618 // Type or member is obsolete
413+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
414414
#pragma warning restore ASPDEPR004 // Type or member is obsolete
415415

416416
// Assert
@@ -831,9 +831,9 @@ public async Task DisposedServerThrows()
831831
context.Response.Body.Dispose();
832832
});
833833
});
834-
#pragma warning disable CS0618 // Type or member is obsolete
834+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
835835
var server = new TestServer(builder);
836-
#pragma warning restore CS0618 // Type or member is obsolete
836+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
837837
#pragma warning restore ASPDEPR004 // Type or member is obsolete
838838

839839
HttpResponseMessage result = await server.CreateClient().GetAsync("/");

‎src/Hosting/WindowsServices/src/WebHostService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Hosting.WindowsServices;
1212
/// Provides an implementation of a Windows service that hosts ASP.NET Core.
1313
/// </summary>
1414
[DesignerCategory("Code")]
15-
[Obsolete("Use UseWindowsService and AddHostedService instead.", DiagnosticId = "ASPDEPR004")]
15+
[Obsolete("Use UseWindowsService and AddHostedService instead.", DiagnosticId = "ASPDEPR009")]
1616
public class WebHostService : ServiceBase
1717
{
1818
private readonly IWebHost _host;

‎src/Hosting/WindowsServices/src/WebHostWindowsServiceExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Hosting.WindowsServices;
88
/// <summary>
99
/// Extensions to <see cref="IWebHost"/> for hosting inside a Windows service.
1010
/// </summary>
11-
[Obsolete("Use UseWindowsService and AddHostedService instead.", DiagnosticId = "ASPDEPR004")]
11+
[Obsolete("Use UseWindowsService and AddHostedService instead.", DiagnosticId = "ASPDEPR009")]
1212
public static class WebHostWindowsServiceExtensions
1313
{
1414
/// <summary>

‎src/Hosting/WindowsServices/test/WebHostServiceTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public async Task StopBeforeServiceStarted()
2424
var host = new WebHostBuilder().UseServer(new FakeServer()).Configure(x => { }).Build();
2525
#pragma warning restore ASPDEPR008 // IWebHost is obsolete
2626
#pragma warning restore ASPDEPR004 // Type or member is obsolete
27-
#pragma warning disable CS0618 // Type or member is obsolete
27+
#pragma warning disable ASPDEPR009 // Type or member is obsolete
2828
var webHostService = new WebHostService(host);
29-
#pragma warning restore CS0618 // Type or member is obsolete
29+
#pragma warning restore ASPDEPR009 // Type or member is obsolete
3030
var applicationLifetime = host.Services.GetRequiredService<IHostApplicationLifetime>();
3131

3232
applicationLifetime.StopApplication();
@@ -44,9 +44,9 @@ public async Task StopAfterServiceStarted()
4444
var host = new WebHostBuilder().UseServer(new FakeServer()).Configure(x => { }).Build();
4545
#pragma warning restore ASPDEPR008 // IWebHost is obsolete
4646
#pragma warning restore ASPDEPR004 // Type or member is obsolete
47-
#pragma warning disable CS0618 // Type or member is obsolete
47+
#pragma warning disable ASPDEPR009 // Type or member is obsolete
4848
var webHostService = new WebHostService(host);
49-
#pragma warning restore CS0618 // Type or member is obsolete
49+
#pragma warning restore ASPDEPR009 // Type or member is obsolete
5050
var applicationLifetime = host.Services.GetRequiredService<IHostApplicationLifetime>();
5151

5252
webHostService.Start();

‎src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ public virtual IServiceProvider Services
108108
return _webHost?.Services ?? _host!.Services;
109109
}
110110

111-
#pragma warning disable CS0618 // Type or member is obsolete
111+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
112112
return _host?.Services ?? _server!.Host.Services;
113-
#pragma warning restore CS0618 // Type or member is obsolete
113+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
114114
}
115115
}
116116

@@ -146,9 +146,9 @@ internal virtual WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Actio
146146
{
147147
var factory = new DelegatedWebApplicationFactory(
148148
ClientOptions,
149-
#pragma warning disable CS0618 // Type or member is obsolete
149+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
150150
CreateServer,
151-
#pragma warning restore CS0618 // Type or member is obsolete
151+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
152152
CreateServer,
153153
CreateHost,
154154
CreateWebHostBuilder,
@@ -319,9 +319,9 @@ public void StartServer()
319319
}
320320
else
321321
{
322-
#pragma warning disable CS0618 // Type or member is obsolete
322+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
323323
_server = CreateServer(builder);
324-
#pragma warning restore CS0618 // Type or member is obsolete
324+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
325325
}
326326
}
327327
}

‎src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ protected override TestServer CreateServer(IWebHostBuilder builder)
5252
{
5353
CultureInfo.CurrentCulture = new CultureInfo("en-GB");
5454
CultureInfo.CurrentUICulture = new CultureInfo("en-US");
55-
#pragma warning disable CS0618 // Type or member is obsolete
55+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
5656
return base.CreateServer(builder);
57-
#pragma warning restore CS0618 // Type or member is obsolete
57+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
5858
}
5959
finally
6060
{

‎src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
141141
base.ConfigureWebHost(builder);
142142
}
143143

144-
#pragma warning disable CS0618 // Member overrides obsolete member
144+
#pragma warning disable ASPDEPR008 // Type or member is obsolete
145145
#pragma warning disable CS0672 // Member overrides obsolete member
146146
protected override TestServer CreateServer(IWebHostBuilder builder)
147147
#pragma warning restore CS0672 // Member overrides obsolete member
148148
{
149149
CreateServerCalled = true;
150150
return base.CreateServer(builder);
151151
}
152-
#pragma warning restore CS0618 // Member overrides obsolete member
152+
#pragma warning restore ASPDEPR008 // Type or member is obsolete
153153

154154
protected override TestServer CreateServer(IServiceProvider serviceProvider)
155155
{

‎src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<InProcessTestSite>true</InProcessTestSite>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
8-
<NoWarn>$(NoWarn);ASPDEPR004;ASPDEPR008</NoWarn>
98
</PropertyGroup>
109

1110
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">

‎src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,30 @@ public static int Main(string[] args)
5656
return 12;
5757
case "HangOnStop":
5858
{
59+
#pragma warning disable ASPDEPR004 // Type or member is obsolete
5960
#pragma warning disable ASPDEPR008 // Type or member is obsolete
6061
var host = new WebHostBuilder()
6162
.UseIIS()
6263
.UseStartup<Startup>()
6364
.Build();
6465
#pragma warning restore ASPDEPR008 // Type or member is obsolete
66+
#pragma warning restore ASPDEPR004 // Type or member is obsolete
6567
host.Run();
6668

6769
Thread.Sleep(Timeout.Infinite);
6870
}
6971
break;
7072
case "IncreaseShutdownLimit":
7173
{
74+
#pragma warning disable ASPDEPR004 // Type or member is obsolete
7275
#pragma warning disable ASPDEPR008 // Type or member is obsolete
7376
var host = new WebHostBuilder()
7477
.UseIIS()
7578
.UseShutdownTimeout(TimeSpan.FromSeconds(120))
7679
.UseStartup<Startup>()
7780
.Build();
7881
#pragma warning restore ASPDEPR008 // Type or member is obsolete
82+
#pragma warning restore ASPDEPR004 // Type or member is obsolete
7983

8084
host.Run();
8185
}
@@ -98,13 +102,15 @@ public static int Main(string[] args)
98102
return 0;
99103
case "OverriddenServer":
100104
{
105+
#pragma warning disable ASPDEPR004 // Type or member is obsolete
101106
#pragma warning disable ASPDEPR008 // Type or member is obsolete
102107
var host = new WebHostBuilder()
103108
.UseIIS()
104109
.ConfigureServices(services => services.AddSingleton<IServer, DummyServer>())
105110
.Configure(builder => builder.Run(async context => { await context.Response.WriteAsync("I shouldn't work"); }))
106111
.Build();
107112
#pragma warning restore ASPDEPR008 // Type or member is obsolete
113+
#pragma warning restore ASPDEPR004 // Type or member is obsolete
108114
host.Run();
109115
}
110116
break;
@@ -117,6 +123,7 @@ public static int Main(string[] args)
117123
#if !FORWARDCOMPAT
118124
case "DecreaseRequestLimit":
119125
{
126+
#pragma warning disable ASPDEPR004 // Type or member is obsolete
120127
#pragma warning disable ASPDEPR008 // Type or member is obsolete
121128
var host = new WebHostBuilder()
122129
.ConfigureLogging((_, factory) =>
@@ -132,13 +139,15 @@ public static int Main(string[] args)
132139
.UseStartup<Startup>()
133140
.Build();
134141
#pragma warning restore ASPDEPR008 // Type or member is obsolete
142+
#pragma warning restore ASPDEPR004 // Type or member is obsolete
135143

136144
host.Run();
137145
break;
138146
}
139147
#endif
140148
case "ThrowInStartup":
141149
{
150+
#pragma warning disable ASPDEPR004 // Type or member is obsolete
142151
#pragma warning disable ASPDEPR008 // Type or member is obsolete
143152
var host = new WebHostBuilder()
144153
.ConfigureLogging((_, factory) =>
@@ -150,6 +159,7 @@ public static int Main(string[] args)
150159
.UseStartup<ThrowingStartup>()
151160
.Build();
152161
#pragma warning restore ASPDEPR008 // Type or member is obsolete
162+
#pragma warning restore ASPDEPR004 // Type or member is obsolete
153163

154164
host.Run();
155165
}
@@ -199,6 +209,7 @@ public static int Main(string[] args)
199209

200210
private static int StartServer()
201211
{
212+
#pragma warning disable ASPDEPR004 // Type or member is obsolete
202213
#pragma warning disable ASPDEPR008 // Type or member is obsolete
203214
var host = new WebHostBuilder()
204215
.ConfigureLogging((_, factory) =>
@@ -212,6 +223,7 @@ private static int StartServer()
212223
.UseStartup<Startup>()
213224
.Build();
214225
#pragma warning restore ASPDEPR008 // Type or member is obsolete
226+
#pragma warning restore ASPDEPR004 // Type or member is obsolete
215227

216228
host.Run();
217229
return 0;

0 commit comments

Comments
 (0)