Skip to content

Commit 3bc8d22

Browse files
zhiyuanliang-mszhiyuanliang-ms
committed
remove unmerged change
1 parent f7f7889 commit 3bc8d22

30 files changed

+0
-682
lines changed

‎src/Microsoft.FeatureManagement.AspNetCore/AspNetCoreFeatureManagementBuilderExtensions.cs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved.
22
// Licensed under the MIT license.
33

4-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net7.0)'
5-
Before:
6-
// Copyright (c) Microsoft Corporation.
7-
// Licensed under the MIT license.
8-
//
9-
After:
10-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
11-
// Licensed under the MIT license.
12-
*/
13-
14-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net8.0)'
15-
Before:
16-
// Copyright (c) Microsoft Corporation.
17-
// Licensed under the MIT license.
18-
//
19-
After:
20-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
21-
// Licensed under the MIT license.
22-
*/
23-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
24-
// Licensed under the MIT license.
25-
264
using System;
275
using System.Collections.Generic;
286
using Microsoft.AspNetCore.Mvc.Filters;

‎src/Microsoft.FeatureManagement.AspNetCore/FeatureGateAttribute.cs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved.
22
// Licensed under the MIT license.
33

4-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net7.0)'
5-
Before:
6-
// Copyright (c) Microsoft Corporation.
7-
// Licensed under the MIT license.
8-
//
9-
After:
10-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
11-
// Licensed under the MIT license.
12-
*/
13-
14-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net8.0)'
15-
Before:
16-
// Copyright (c) Microsoft Corporation.
17-
// Licensed under the MIT license.
18-
//
19-
After:
20-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
21-
// Licensed under the MIT license.
22-
*/
23-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
24-
// Licensed under the MIT license.
25-
264
using System;
275
using System.Collections.Generic;
286
using System.Linq;

‎src/Microsoft.FeatureManagement.AspNetCore/FeatureGatedAsyncActionFilter.cs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved.
22
// Licensed under the MIT license.
33

4-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net7.0)'
5-
Before:
6-
// Copyright (c) Microsoft Corporation.
7-
// Licensed under the MIT license.
8-
//
9-
After:
10-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
11-
// Licensed under the MIT license.
12-
*/
13-
14-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net8.0)'
15-
Before:
16-
// Copyright (c) Microsoft Corporation.
17-
// Licensed under the MIT license.
18-
//
19-
After:
20-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
21-
// Licensed under the MIT license.
22-
*/
23-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
24-
// Licensed under the MIT license.
25-
264
using System;
275
using System.Threading.Tasks;
286
using Microsoft.AspNetCore.Mvc.Filters;

‎src/Microsoft.FeatureManagement.AspNetCore/IDisabledFeatureHandler.cs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved.
22
// Licensed under the MIT license.
33

4-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net7.0)'
5-
Before:
6-
// Copyright (c) Microsoft Corporation.
7-
// Licensed under the MIT license.
8-
//
9-
After:
10-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
11-
// Licensed under the MIT license.
12-
*/
13-
14-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net8.0)'
15-
Before:
16-
// Copyright (c) Microsoft Corporation.
17-
// Licensed under the MIT license.
18-
//
19-
After:
20-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
21-
// Licensed under the MIT license.
22-
*/
23-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
24-
// Licensed under the MIT license.
25-
264
using System.Collections.Generic;
275
using System.Threading.Tasks;
286
using Microsoft.AspNetCore.Mvc.Filters;

‎src/Microsoft.FeatureManagement.AspNetCore/InlineDisabledFeatureHandler.cs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved.
22
// Licensed under the MIT license.
33

4-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net7.0)'
5-
Before:
6-
// Copyright (c) Microsoft Corporation.
7-
// Licensed under the MIT license.
8-
//
9-
After:
10-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
11-
// Licensed under the MIT license.
12-
*/
13-
14-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net8.0)'
15-
Before:
16-
// Copyright (c) Microsoft Corporation.
17-
// Licensed under the MIT license.
18-
//
19-
After:
20-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
21-
// Licensed under the MIT license.
22-
*/
23-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
24-
// Licensed under the MIT license.
25-
264
using System;
275
using System.Collections.Generic;
286
using System.Threading.Tasks;

‎src/Microsoft.FeatureManagement.AspNetCore/NotFoundDisabledFeatureHandler.cs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved.
22
// Licensed under the MIT license.
33

4-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net7.0)'
5-
Before:
6-
// Copyright (c) Microsoft Corporation.
7-
// Licensed under the MIT license.
8-
//
9-
After:
10-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
11-
// Licensed under the MIT license.
12-
*/
13-
14-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net8.0)'
15-
Before:
16-
// Copyright (c) Microsoft Corporation.
17-
// Licensed under the MIT license.
18-
//
19-
After:
20-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
21-
// Licensed under the MIT license.
22-
*/
23-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
24-
// Licensed under the MIT license.
25-
264
using System.Collections.Generic;
275
using System.Threading.Tasks;
286
using Microsoft.AspNetCore.Http;

‎src/Microsoft.FeatureManagement.AspNetCore/TagHelpers/FeatureTagHelper.cs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved.
22
// Licensed under the MIT license.
33

4-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net7.0)'
5-
Before:
6-
// Copyright (c) Microsoft Corporation.
7-
// Licensed under the MIT license.
8-
//
9-
After:
10-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
11-
// Licensed under the MIT license.
12-
*/
13-
14-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net8.0)'
15-
Before:
16-
// Copyright (c) Microsoft Corporation.
17-
// Licensed under the MIT license.
18-
//
19-
After:
20-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
21-
// Licensed under the MIT license.
22-
*/
23-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
24-
// Licensed under the MIT license.
25-
264
using System.Collections.Generic;
275
using System.Linq;
286
using System.Threading.Tasks;

‎src/Microsoft.FeatureManagement.AspNetCore/UseForFeatureExtensions.cs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved.
22
// Licensed under the MIT license.
33

4-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net7.0)'
5-
Before:
6-
// Copyright (c) Microsoft Corporation.
7-
// Licensed under the MIT license.
8-
//
9-
After:
10-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
11-
// Licensed under the MIT license.
12-
*/
13-
14-
/* Unmerged change from project 'Microsoft.FeatureManagement.AspNetCore(net8.0)'
15-
Before:
16-
// Copyright (c) Microsoft Corporation.
17-
// Licensed under the MIT license.
18-
//
19-
After:
20-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
21-
// Licensed under the MIT license.
22-
*/
23-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
24-
// Licensed under the MIT license.
25-
264
using System;
275
using Microsoft.AspNetCore.Builder;
286
using Microsoft.AspNetCore.Http;

‎src/Microsoft.FeatureManagement/ConfigurationFeatureDefinitionProvider.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved.
22
// Licensed under the MIT license.
33

4-
/* Unmerged change from project 'Microsoft.FeatureManagement(netstandard2.1)'
5-
Before:
6-
// Copyright (c) Microsoft Corporation.
7-
// Licensed under the MIT license.
8-
//
9-
After:
10-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
11-
// Licensed under the MIT license.
12-
*/
13-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
14-
// Licensed under the MIT license.
15-
164
using System;
175
using System.Collections.Concurrent;
186
using System.Collections.Generic;

‎src/Microsoft.FeatureManagement/FeatureFilterConfiguration.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved.
22
// Licensed under the MIT license.
33

4-
/* Unmerged change from project 'Microsoft.FeatureManagement(netstandard2.1)'
5-
Before:
6-
// Copyright (c) Microsoft Corporation.
7-
// Licensed under the MIT license.
8-
//
9-
After:
10-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
11-
// Licensed under the MIT license.
12-
*/
13-
// Copyright (c) Microsoft Corporation. All Rights Reserved.
14-
// Licensed under the MIT license.
15-
164
using System.Collections.Generic;
175
using Microsoft.Extensions.Configuration;
186

0 commit comments

Comments
 (0)