Skip to content

Commit a3f9b74

Browse files
author
Nate McMaster
committed
Merge branch 'release/2.1' into release/2.2
2 parents ce54847 + 5d16f97 commit a3f9b74

File tree

167 files changed

+189
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+189
-291
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
</PropertyGroup>
9393

9494
<PropertyGroup>
95-
<StandardTestTfms>netcoreapp2.2;net461</StandardTestTfms>
9695
<!-- Projects which reference Microsoft.AspNetCore.Mvc.Testing should import this targets file to ensure dependency .deps.json files are copied into test output. -->
9796
<MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
9897
</PropertyGroup>

‎build/tasks/RepoTasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$(RepoTasksSdkPath)\Sdk.props" Condition="'$(RepoTasksSdkPath)' != '' "/>
33

44
<PropertyGroup>
5-
<TargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core' ">netcoreapp2.0</TargetFramework>
5+
<TargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core' ">netcoreapp2.2</TargetFramework>
66
<TargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core' ">net461</TargetFramework>
77
</PropertyGroup>
88

‎src/Antiforgery/test/Microsoft.AspNetCore.Antiforgery.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/AuthSamples/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<PlatformTarget>AnyCPU</PlatformTarget>
56
</PropertyGroup>
67

7-
<!-- Workaround for https://github.com/dotnet/sdk/issues/1729 -->
8-
<Target Name="ResetPlatformTarget" BeforeTargets="CoreCompile" Condition="'$(TargetFramework)'=='netcoreapp2.1'">
9-
<PropertyGroup>
10-
<PlatformTarget>AnyCPU</PlatformTarget>
11-
</PropertyGroup>
12-
</Target>
13-
148
<ItemGroup>
159
<ProjectReference Include="..\..\samples\Cookies\Cookies.csproj" />
1610
<ProjectReference Include="..\..\samples\ClaimsTransformation\ClaimsTransformation.csproj" />

‎src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,10 @@ public JavaScriptSnippetTest(ITestOutputHelper output) : base(output)
1717
{
1818
}
1919

20-
[Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")]
21-
public Task ScriptIsInjected_ForNetCoreApp20_Standalone() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.0", ApplicationType.Standalone);
22-
23-
[Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")]
24-
public Task ScriptIsInjected_ForNetCoreApp20_Portable() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.0", ApplicationType.Portable);
25-
26-
[Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")]
27-
public Task ScriptIsInjected_ForNetCoreApp21_Standalone() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.1", ApplicationType.Standalone);
28-
29-
[Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")]
30-
public Task ScriptIsInjected_ForNetCoreApp21_Portable() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.1", ApplicationType.Portable);
31-
32-
private async Task JavaScriptSnippetInjectionTestSuite(string targetFramework, ApplicationType applicationType)
20+
[Theory]
21+
[InlineData(ApplicationType.Portable)]
22+
[InlineData(ApplicationType.Standalone)]
23+
public async Task JavaScriptSnippetInjectionTestSuite(ApplicationType applicationType)
3324
{
3425
var testName = $"ApplicationInsightsJavaScriptSnippetTest_{applicationType}";
3526
using (StartLog(out var loggerFactory, testName))
@@ -39,7 +30,7 @@ private async Task JavaScriptSnippetInjectionTestSuite(string targetFramework, A
3930
{
4031
PublishApplicationBeforeDeployment = true,
4132
PreservePublishedApplicationForDebugging = PreservePublishedApplicationForDebugging,
42-
TargetFramework = targetFramework,
33+
TargetFramework = "netcoreapp2.2",
4334
Configuration = GetCurrentBuildConfiguration(),
4435
ApplicationType = applicationType,
4536
EnvironmentName = "JavaScript",

‎src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/LoggingTest.cs

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,12 @@ public LoggingTest(ITestOutputHelper output) : base(output)
1717
{
1818
}
1919

20-
[Fact]
21-
public Task DefaultAILogFiltersApplied_ForNetCoreApp20_Portable() => DefaultAILogFiltersApplied("netcoreapp2.0", ApplicationType.Portable);
22-
23-
[Fact]
24-
public Task DefaultAILogFiltersApplied_ForNetCoreApp20_Standalone() => DefaultAILogFiltersApplied("netcoreapp2.0", ApplicationType.Standalone);
25-
26-
[Fact]
27-
public Task DefaultAILogFiltersApplied_ForNetCoreApp21_Portable() => DefaultAILogFiltersApplied("netcoreapp2.1", ApplicationType.Portable);
28-
29-
[Fact]
30-
public Task DefaultAILogFiltersApplied_ForNetCoreApp21_Standalone() => DefaultAILogFiltersApplied("netcoreapp2.1", ApplicationType.Standalone);
31-
32-
private async Task DefaultAILogFiltersApplied(string targetFramework, ApplicationType applicationType)
20+
[Theory]
21+
[InlineData(ApplicationType.Portable)]
22+
[InlineData(ApplicationType.Standalone)]
23+
public async Task DefaultAILogFiltersApplied(ApplicationType applicationType)
3324
{
34-
var responseText = await RunRequest(targetFramework, applicationType, "DefaultLogging");
25+
var responseText = await RunRequest(applicationType, "DefaultLogging");
3526

3627
// Enabled by default
3728
Assert.Contains("System warning log", responseText);
@@ -62,21 +53,12 @@ private async Task DefaultAILogFiltersApplied(string targetFramework, Applicatio
6253
Assert.Contains("Specific trace log", responseText);
6354
}
6455

65-
[Fact]
66-
public Task CustomAILogFiltersApplied_ForNetCoreApp20_Portable() => CustomAILogFiltersApplied("netcoreapp2.0", ApplicationType.Portable);
67-
68-
[Fact]
69-
public Task CustomAILogFiltersApplied_ForNetCoreApp20_Standalone() => CustomAILogFiltersApplied("netcoreapp2.0", ApplicationType.Standalone);
70-
71-
[Fact]
72-
public Task CustomAILogFiltersApplied_ForNetCoreApp21_Portable() => CustomAILogFiltersApplied("netcoreapp2.1", ApplicationType.Portable);
73-
74-
[Fact]
75-
public Task CustomAILogFiltersApplied_ForNetCoreApp21_Standalone() => CustomAILogFiltersApplied("netcoreapp2.1", ApplicationType.Standalone);
76-
77-
private async Task CustomAILogFiltersApplied(string targetFramework, ApplicationType applicationType)
56+
[Theory]
57+
[InlineData(ApplicationType.Portable)]
58+
[InlineData(ApplicationType.Standalone)]
59+
public async Task CustomAILogFiltersApplied(ApplicationType applicationType)
7860
{
79-
var responseText = await RunRequest(targetFramework, applicationType, "CustomLogging");
61+
var responseText = await RunRequest(applicationType, "CustomLogging");
8062
// Custom logger allows only namespaces with 'o' in the name
8163

8264
Assert.DoesNotContain("System warning log", responseText);
@@ -99,7 +81,7 @@ private async Task CustomAILogFiltersApplied(string targetFramework, Application
9981
Assert.DoesNotContain("Specific trace log", responseText);
10082
}
10183

102-
private async Task<string> RunRequest(string targetFramework, ApplicationType applicationType, string environment)
84+
private async Task<string> RunRequest(ApplicationType applicationType, string environment)
10385
{
10486
string responseText;
10587
var testName = $"ApplicationInsightsLoggingTest_{applicationType}";
@@ -111,7 +93,7 @@ private async Task<string> RunRequest(string targetFramework, ApplicationType ap
11193
{
11294
PublishApplicationBeforeDeployment = true,
11395
PreservePublishedApplicationForDebugging = PreservePublishedApplicationForDebugging,
114-
TargetFramework = "netcoreapp2.0",
96+
TargetFramework = "netcoreapp2.2",
11597
Configuration = GetCurrentBuildConfiguration(),
11698
ApplicationType = applicationType,
11799
EnvironmentName = environment,

‎src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
55
<RuntimeIdentifiers>win7-x86;win7-x64;linux-x64;osx-x64</RuntimeIdentifiers>
66
</PropertyGroup>
77

‎src/AzureIntegration/test/Directory.Build.props

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33

4-
<PropertyGroup>
5-
<DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
6-
<StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
7-
8-
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
9-
</PropertyGroup>
10-
114
<ItemGroup>
125
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
136
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />

‎src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
55

66
<!--
77
Workaround for "Use executable flags in Microsoft.NET.Test.Sdk" (https://github.com/Microsoft/vstest/issues/792).

‎src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)