Skip to content

Commit e8f4104

Browse files
committed
Merge branch 'main' into PolyfillUwp.slnx
2 parents 7d16948 + e1ed3c8 commit e8f4104

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

src/Polyfill/EmbeddedAttribute.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
#error PolyPublic should not be used with PolyUseEmbeddedAttribute.
88
#endif
99

10-
namespace Microsoft.CodeAnalysis
11-
{
12-
internal sealed partial class EmbeddedAttribute : global::System.Attribute
13-
{
14-
}
15-
}
10+
namespace Microsoft.CodeAnalysis;
11+
12+
using System;
13+
14+
sealed partial class EmbeddedAttribute : Attribute;
1615
#endif

src/Polyfill/Polyfill.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@
3939
Condition="($(LowerFrameworks.Contains('net5')) OR
4040
$(LowerFrameworks.Contains('net6')) OR
4141
$(LowerFrameworks.Contains('net7')) OR
42+
$(LowerFrameworks.Contains('net8')) OR
4243
$(LowerFrameworks.Contains('netstandard')) OR
4344
$(LowerFrameworks.Contains('netcore')))
4445
AND
45-
!$(LowerFrameworks.Contains('net8'))
46+
!$(LowerFrameworks.Contains('net9'))
4647
AND
47-
!$(LowerFramework.Contains('net8'))"
48+
!$(LowerFramework.Contains('net9'))"
4849
>true</MaxNetRequired>
4950
<MaxNetClassicRequired>false</MaxNetClassicRequired>
5051
<MaxNetClassicRequired

target-frameworks.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,13 @@ At build time, if a project is detected to not properly multi target, then a war
7575
Condition="($(LowerFrameworks.Contains('net5')) OR
7676
$(LowerFrameworks.Contains('net6')) OR
7777
$(LowerFrameworks.Contains('net7')) OR
78+
$(LowerFrameworks.Contains('net8')) OR
7879
$(LowerFrameworks.Contains('netstandard')) OR
7980
$(LowerFrameworks.Contains('netcore')))
8081
AND
81-
!$(LowerFrameworks.Contains('net8'))
82+
!$(LowerFrameworks.Contains('net9'))
8283
AND
83-
!$(LowerFramework.Contains('net8'))"
84+
!$(LowerFramework.Contains('net9'))"
8485
>true</MaxNetRequired>
8586
<MaxNetClassicRequired>false</MaxNetClassicRequired>
8687
<MaxNetClassicRequired
@@ -95,7 +96,7 @@ At build time, if a project is detected to not properly multi target, then a war
9596
>true</MaxNetClassicRequired>
9697
</PropertyGroup>
9798
```
98-
<sup><a href='/src/Polyfill/Polyfill.targets#L35-L61' title='Snippet source file'>snippet source</a> | <a href='#snippet-MaxNetRequired' title='Start of snippet'>anchor</a></sup>
99+
<sup><a href='/src/Polyfill/Polyfill.targets#L35-L62' title='Snippet source file'>snippet source</a> | <a href='#snippet-MaxNetRequired' title='Start of snippet'>anchor</a></sup>
99100
<!-- endSnippet -->
100101

101102

@@ -119,7 +120,7 @@ For example:
119120
Condition="$(MaxNetRequired)" />
120121
</Target>
121122
```
122-
<sup><a href='/src/Polyfill/Polyfill.targets#L62-L77' title='Snippet source file'>snippet source</a> | <a href='#snippet-PolyfillValidateNugetTargets' title='Start of snippet'>anchor</a></sup>
123+
<sup><a href='/src/Polyfill/Polyfill.targets#L63-L78' title='Snippet source file'>snippet source</a> | <a href='#snippet-PolyfillValidateNugetTargets' title='Start of snippet'>anchor</a></sup>
123124
<!-- endSnippet -->
124125

125126

0 commit comments

Comments
 (0)