File tree 18 files changed +49
-55
lines changed
18 files changed +49
-55
lines changed Original file line number Diff line number Diff line change 19
19
<!-- .NET Standard 2.0 doesn't have the Span<T> type -->
20
20
<When Condition =" '$(TargetFramework)' == 'netstandard2.0'" >
21
21
<ItemGroup >
22
- <PackageReference Include =" System.Memory" Version =" 4.5.5 " />
22
+ <PackageReference Include =" System.Memory" Version =" 4.6.0 " />
23
23
</ItemGroup >
24
24
</When >
25
25
26
26
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
27
27
<When Condition =" '$(TargetFramework)' == 'netstandard2.1'" >
28
28
<ItemGroup >
29
- <PackageReference Include =" System.Runtime.CompilerServices.Unsafe" Version =" 6.0 .0" />
29
+ <PackageReference Include =" System.Runtime.CompilerServices.Unsafe" Version =" 6.1 .0" />
30
30
</ItemGroup >
31
31
</When >
32
32
</Choose >
Original file line number Diff line number Diff line change 30
30
31
31
<!-- .NET Standard 2.0 doesn't have the Span<T>, HashCode and ValueTask types -->
32
32
<ItemGroup >
33
- <PackageReference Include =" Microsoft.Bcl.HashCode" Version =" 1.1.1 " />
34
- <PackageReference Include =" System.Memory" Version =" 4.5.5 " />
35
- <PackageReference Include =" System.Threading.Tasks.Extensions" Version =" 4.5.4 " />
36
- <PackageReference Include =" System.Runtime.CompilerServices.Unsafe" Version =" 6.0 .0" />
33
+ <PackageReference Include =" Microsoft.Bcl.HashCode" Version =" 6.0.0 " />
34
+ <PackageReference Include =" System.Memory" Version =" 4.6.0 " />
35
+ <PackageReference Include =" System.Threading.Tasks.Extensions" Version =" 4.6.0 " />
36
+ <PackageReference Include =" System.Runtime.CompilerServices.Unsafe" Version =" 6.1 .0" />
37
37
</ItemGroup >
38
38
39
39
<!-- On .NET Standard 2.0, the unit test project also needs access to internals -->
45
45
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
46
46
<When Condition =" '$(TargetFramework)' == 'netstandard2.1'" >
47
47
<ItemGroup >
48
- <PackageReference Include =" System.Runtime.CompilerServices.Unsafe" Version =" 6.0 .0" />
48
+ <PackageReference Include =" System.Runtime.CompilerServices.Unsafe" Version =" 6.1 .0" />
49
49
</ItemGroup >
50
50
</When >
51
51
</Choose >
Original file line number Diff line number Diff line change 27
27
<!-- Also define "ROSLYN_<MAJOR>_<MINOR>_OR_GREATER" build constants, so the generator code can multi-target whenever needed and add any required polyfills -->
28
28
<DefineConstants Condition =" $([MSBuild]::VersionGreaterThanOrEquals($(MvvmToolkitSourceGeneratorRoslynVersion), 4.3.1))" >$(DefineConstants);ROSLYN_4_3_1_OR_GREATER</DefineConstants >
29
29
<DefineConstants Condition =" $([MSBuild]::VersionGreaterThanOrEquals($(MvvmToolkitSourceGeneratorRoslynVersion), 4.12.0))" >$(DefineConstants);ROSLYN_4_12_0_OR_GREATER</DefineConstants >
30
-
31
- <!-- Temporary fixup until Roslyn 4.12 ships to public NuGet -->
32
- <MvvmToolkitSourceGeneratorRoslynVersion Condition =" '$(MvvmToolkitSourceGeneratorRoslynVersion)' == '4.12.0'" >4.12.0-3.final</MvvmToolkitSourceGeneratorRoslynVersion >
33
30
</PropertyGroup >
34
31
35
32
<ItemGroup >
Original file line number Diff line number Diff line change 44
44
45
45
<!-- Disable the removed rules analyzer for older Roslyn versions (as we might not support all diagnostics) -->
46
46
<NoWarn Condition =" $([MSBuild]::VersionLessThan($(MvvmToolkitSourceGeneratorRoslynVersion), 4.12.0))" >$(NoWarn);RS2003</NoWarn >
47
-
48
- <!-- Temporary fixup until Roslyn 4.12 ships to public NuGet -->
49
- <MvvmToolkitSourceGeneratorRoslynVersion Condition =" '$(MvvmToolkitSourceGeneratorRoslynVersion)' == '4.12.0'" >4.12.0-3.final</MvvmToolkitSourceGeneratorRoslynVersion >
50
47
</PropertyGroup >
51
48
52
49
<ItemGroup >
Original file line number Diff line number Diff line change 28
28
- The recommended Windows SDK package for WindowsAppSDK projects (ie. without UWP XAML projections).
29
29
-->
30
30
<_MvvmToolkitWindowsSdkPackageMinBuild >38</_MvvmToolkitWindowsSdkPackageMinBuild >
31
- <_MvvmToolkitWindowsSdkPackageRecommendedUwpBuild >39 </_MvvmToolkitWindowsSdkPackageRecommendedUwpBuild >
32
- <_MvvmToolkitWindowsSdkPackageRecommendedWindowsAppSDKBuild >41 </_MvvmToolkitWindowsSdkPackageRecommendedWindowsAppSDKBuild >
31
+ <_MvvmToolkitWindowsSdkPackageRecommendedUwpBuild >54 </_MvvmToolkitWindowsSdkPackageRecommendedUwpBuild >
32
+ <_MvvmToolkitWindowsSdkPackageRecommendedWindowsAppSDKBuild >53 </_MvvmToolkitWindowsSdkPackageRecommendedWindowsAppSDKBuild >
33
33
34
34
<!-- Switch on the recommended one based on configuration -->
35
35
<_MvvmToolkitWindowsSdkPackageRecommendedBuild >$(_MvvmToolkitWindowsSdkPackageMinBuild)</_MvvmToolkitWindowsSdkPackageRecommendedBuild >
Original file line number Diff line number Diff line change 44
44
<ItemGroup Condition =" '$(TargetFramework)' == 'netstandard2.0'" >
45
45
<PackageReference Include =" Microsoft.Bcl.AsyncInterfaces" Version =" 8.0.0" />
46
46
<PackageReference Include =" System.ComponentModel.Annotations" Version =" 5.0.0" />
47
- <PackageReference Include =" System.Memory" Version =" 4.5.5 " />
48
- <PackageReference Include =" System.Runtime.CompilerServices.Unsafe" Version =" 6.0 .0" />
47
+ <PackageReference Include =" System.Memory" Version =" 4.6.0 " />
48
+ <PackageReference Include =" System.Runtime.CompilerServices.Unsafe" Version =" 6.1 .0" />
49
49
</ItemGroup >
50
50
51
51
<!-- .NET Standard 2.1 doesn't have the Unsafe type -->
52
52
<ItemGroup Condition =" '$(TargetFramework)' == 'netstandard2.1'" >
53
53
<PackageReference Include =" System.ComponentModel.Annotations" Version =" 5.0.0" />
54
- <PackageReference Include =" System.Runtime.CompilerServices.Unsafe" Version =" 6.0 .0" />
54
+ <PackageReference Include =" System.Runtime.CompilerServices.Unsafe" Version =" 6.1 .0" />
55
55
</ItemGroup >
56
56
57
57
<!-- Include the ILLink file (to properly trim configuration switches in publish builds) -->
Original file line number Diff line number Diff line change 3
3
4
4
<!-- Include PolySharp to generate polyfills for all projects (on their .NET Standard 2.x targets) -->
5
5
<ItemGroup >
6
- <PackageReference Include =" PolySharp" Version =" 1.14.1 " >
6
+ <PackageReference Include =" PolySharp" Version =" 1.15.0 " >
7
7
<PrivateAssets >all</PrivateAssets >
8
8
<IncludeAssets >build; analyzers</IncludeAssets >
9
9
</PackageReference >
Original file line number Diff line number Diff line change 5
5
</PropertyGroup >
6
6
7
7
<ItemGroup >
8
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
9
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
10
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
8
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
9
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
10
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
11
11
</ItemGroup >
12
12
13
13
<ItemGroup >
Original file line number Diff line number Diff line change 5
5
</PropertyGroup >
6
6
7
7
<ItemGroup >
8
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
9
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
10
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
8
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
9
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
10
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
11
11
</ItemGroup >
12
12
13
13
<ItemGroup >
Original file line number Diff line number Diff line change 11
11
</ItemGroup >
12
12
13
13
<ItemGroup >
14
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
15
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
16
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
14
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
15
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
16
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
17
17
</ItemGroup >
18
18
19
19
</Project >
Original file line number Diff line number Diff line change 5
5
</PropertyGroup >
6
6
7
7
<ItemGroup >
8
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
9
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
10
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
8
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
9
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
10
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
11
11
</ItemGroup >
12
12
13
13
<ItemGroup >
Original file line number Diff line number Diff line change 5
5
</PropertyGroup >
6
6
7
7
<ItemGroup >
8
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
9
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
10
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
8
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
9
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
10
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
11
11
</ItemGroup >
12
12
13
13
<ItemGroup >
Original file line number Diff line number Diff line change 7
7
8
8
<ItemGroup >
9
9
<PackageReference Include =" Dbs.Signed3.Nito.AsyncEx.Context" Version =" 5.0.0" />
10
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
11
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
12
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
10
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
11
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
12
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
13
13
<PackageReference Include =" System.Reactive" Version =" 6.0.1" />
14
14
<PackageReference Include =" System.Text.Json" Version =" 8.0.5" />
15
15
</ItemGroup >
Original file line number Diff line number Diff line change 7
7
8
8
<ItemGroup >
9
9
<PackageReference Include =" Dbs.Signed3.Nito.AsyncEx.Context" Version =" 5.0.0" />
10
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
11
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
12
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
10
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
11
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
12
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
13
13
<PackageReference Include =" System.Reactive" Version =" 6.0.1" />
14
14
<PackageReference Include =" System.Text.Json" Version =" 8.0.5" />
15
15
</ItemGroup >
Original file line number Diff line number Diff line change 12
12
13
13
<ItemGroup >
14
14
<PackageReference Include =" Dbs.Signed3.Nito.AsyncEx.Context" Version =" 5.0.0" />
15
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
16
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
17
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
15
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
16
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
17
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
18
18
<PackageReference Include =" System.Reactive" Version =" 6.0.1" />
19
19
<PackageReference Include =" System.Text.Json" Version =" 8.0.5" />
20
20
</ItemGroup >
Original file line number Diff line number Diff line change 7
7
<ItemGroup >
8
8
<PackageReference Include =" Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version =" 1.1.2" />
9
9
<PackageReference Include =" Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version =" 1.1.2" />
10
- <PackageReference Include =" Microsoft.CodeAnalysis.CSharp.Workspaces" Version =" 4.0.1 " />
11
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
12
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
13
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
10
+ <PackageReference Include =" Microsoft.CodeAnalysis.CSharp.Workspaces" Version =" 4.12.0 " />
11
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
12
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
13
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
14
14
</ItemGroup >
15
15
16
16
<ItemGroup >
Original file line number Diff line number Diff line change 12
12
<ItemGroup >
13
13
<PackageReference Include =" Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version =" 1.1.2" />
14
14
<PackageReference Include =" Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version =" 1.1.2" />
15
- <PackageReference Include =" Microsoft.CodeAnalysis.CSharp.Workspaces" Version =" 4.4 .0" />
16
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
17
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
18
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
15
+ <PackageReference Include =" Microsoft.CodeAnalysis.CSharp.Workspaces" Version =" 4.12 .0" />
16
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
17
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
18
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
19
19
</ItemGroup >
20
20
21
21
<ItemGroup >
Original file line number Diff line number Diff line change 8
8
<ItemGroup >
9
9
<PackageReference Include =" Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version =" 1.1.2" />
10
10
<PackageReference Include =" Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version =" 1.1.2" />
11
- <PackageReference Include =" Microsoft.CodeAnalysis.CSharp.Workspaces" Version =" 4.12.0-3.final " />
12
- <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.11.1 " />
13
- <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.1 " />
14
- <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.1 " />
11
+ <PackageReference Include =" Microsoft.CodeAnalysis.CSharp.Workspaces" Version =" 4.12.0" />
12
+ <PackageReference Include =" Microsoft.NET.Test.Sdk" Version =" 17.12.0 " />
13
+ <PackageReference Include =" MSTest.TestAdapter" Version =" 3.6.4 " />
14
+ <PackageReference Include =" MSTest.TestFramework" Version =" 3.6.4 " />
15
15
</ItemGroup >
16
16
17
17
<ItemGroup >
You can’t perform that action at this time.
0 commit comments