Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add net8.0-windows to WinAppSdk #165

Merged
merged 27 commits into from
Feb 27, 2024
Merged

Add net8.0-windows to WinAppSdk #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
53fe8de
Added net8.0-windows10.0.22621.0
Arlodotexe Jan 11, 2024
e678ae7
Replaced win10-* RuntimeIdentifiers with win-*
Arlodotexe Jan 11, 2024
f85d185
Merge branch 'main' into upgrade/wasdk/net8-windows
Arlodotexe Jan 29, 2024
f94d9cb
Update to net8.0
Arlodotexe Jan 29, 2024
10e21ca
Merge branch 'main' into upgrade/wasdk/net8-windows
Arlodotexe Feb 2, 2024
cb8c8b5
Update Wasdk to 1.5.240205001-preview1
Arlodotexe Feb 8, 2024
5059444
Include MSBuild.Sdk.Extras/3.0.23 on UWP only
Arlodotexe Feb 9, 2024
a509481
Move conditional MSBuild Extras to library only
Arlodotexe Feb 16, 2024
f7c1603
Update to .NET 8.0.201
Arlodotexe Feb 16, 2024
2f09929
Handle case-sensitivity for importing Directory.Build.props
Arlodotexe Feb 17, 2024
56ae5bd
Merge branch 'main' into upgrade/wasdk/net8-windows
Arlodotexe Feb 17, 2024
6448e44
Update to latest stable Microsoft.CodeAnalysis.CSharp and Microsoft.C…
Arlodotexe Feb 19, 2024
6967d0f
Update System.Collections.Immutable to 8.0.0
Arlodotexe Feb 19, 2024
45411e1
Update Microsoft.CodeAnalysis.CSharp.Workspaces to latest stable 4.8.0
Arlodotexe Feb 20, 2024
5960532
Update Microsoft.CodeAnalysis.CSharp.Workspaces to latest stable 4.8.0
Arlodotexe Feb 20, 2024
553a41d
Merge branch 'main' into upgrade/wasdk/net8-windows
Arlodotexe Feb 20, 2024
b29c871
Merge branch 'main' into upgrade/wasdk/net8-windows
Arlodotexe Feb 21, 2024
e7e20ee
Use RuntimeIdentifiers on both heads and libraries, handle pre-net8 i…
Arlodotexe Feb 21, 2024
5eb8f98
Enable EnforceExtendedAnalyzerRules in source generators
Arlodotexe Feb 21, 2024
40d4e2f
Fixed malformed description warnings
Arlodotexe Feb 21, 2024
33c6a4a
Added AnalyzerReleases for SampleGen and TestGen Diagnostics
Arlodotexe Feb 21, 2024
afc8f87
Use empty source instead of empty string for sourcegen tests
Arlodotexe Feb 21, 2024
14bb2d0
Fixed DiagnosticDescriptors message formatting
Arlodotexe Feb 21, 2024
3d7701b
Partial revert of afc8f87a56a64603ae4e370bec1165598de6fed3
Arlodotexe Feb 21, 2024
75931cf
Update to uno-check 1.20.2
Arlodotexe Feb 23, 2024
47e5adf
Update slngen to latest 11.2.3
Arlodotexe Feb 23, 2024
812daab
Fixed Library.props import order
Arlodotexe Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"uno.check": {
"version": "1.13.0",
"version": "1.20.2",
"commands": [
"uno-check"
]
Expand All @@ -15,7 +15,7 @@
]
},
"microsoft.visualstudio.slngen.tool": {
"version": "9.5.4",
"version": "11.2.3",
"commands": [
"slngen"
]
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"args": {
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
// Append -bullseye or -focal to pin to an OS version.
"VARIANT": "6.0",
"VARIANT": "8.0",
// Options
"NODE_VERSION": "lts/*"
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
workflow_dispatch:

env:
DOTNET_VERSION: ${{ '7.0.x' }}
DOTNET_VERSION: ${{ '8.0.x' }}
ENABLE_DIAGNOSTICS: false
#COREHOST_TRACE: 1
COREHOST_TRACEFILE: corehosttrace.log
Expand Down
2 changes: 1 addition & 1 deletion CommunityToolkit.Tooling.SampleGen.Tests/CommunityToolkit.Tooling.SampleGen.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
Expand Down
17 changes: 13 additions & 4 deletions CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.Documentation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ public class UserControl { }
}
""";

private static readonly string EmptySource = """
namespace MyApp
{
public class MyClass { }
}
""";

[TestMethod]
public void MissingFrontMatterSection()
{
Expand Down Expand Up @@ -183,7 +190,7 @@ public void DocumentationInvalidDiscussionId()
# This is some test documentation...
Without an invalid discussion-id.";

var result = string.Empty.RunSourceGenerator<ToolkitSampleMetadataGenerator>(SAMPLE_ASM_NAME, markdown);
var result = EmptySource.RunSourceGenerator<ToolkitSampleMetadataGenerator>(SAMPLE_ASM_NAME, markdown);

result.AssertNoCompilationErrors();
result.AssertDiagnosticsAre(DiagnosticDescriptors.MarkdownYAMLFrontMatterException, DiagnosticDescriptors.DocumentationHasNoSamples);
Expand Down Expand Up @@ -211,7 +218,7 @@ public void DocumentationInvalidIssueId()
# This is some test documentation...
Without an invalid issue-id.";

var result = string.Empty.RunSourceGenerator<ToolkitSampleMetadataGenerator>(SAMPLE_ASM_NAME, markdown);
var result = EmptySource.RunSourceGenerator<ToolkitSampleMetadataGenerator>(SAMPLE_ASM_NAME, markdown);

result.AssertNoCompilationErrors();
result.AssertDiagnosticsAre(DiagnosticDescriptors.MarkdownYAMLFrontMatterException, DiagnosticDescriptors.DocumentationHasNoSamples);
Expand Down Expand Up @@ -240,7 +247,7 @@ public void DocumentationInvalidIsExperimental()
# This is some test documentation...
Without an invalid experimental value.";

var result = string.Empty.RunSourceGenerator<ToolkitSampleMetadataGenerator>(SAMPLE_ASM_NAME, markdown);
var result = EmptySource.RunSourceGenerator<ToolkitSampleMetadataGenerator>(SAMPLE_ASM_NAME, markdown);

result.AssertNoCompilationErrors();
result.AssertDiagnosticsAre(DiagnosticDescriptors.MarkdownYAMLFrontMatterException, DiagnosticDescriptors.DocumentationHasNoSamples);
Expand Down Expand Up @@ -271,7 +278,9 @@ Which is valid.
> [!SAMPLE Sample]";

string csproj = """
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />

<PropertyGroup>
<ToolkitComponentName>Primitives</ToolkitComponentName>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions CommunityToolkit.Tooling.SampleGen/AnalyzerReleases.Shipped.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
; Shipped analyzer releases
; https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md

22 changes: 22 additions & 0 deletions CommunityToolkit.Tooling.SampleGen/AnalyzerReleases.Unshipped.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
; Unshipped analyzer release
; https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md

### New Rules

Rule ID | Category | Severity | Notes
--------|----------|----------|-------
TKSMPL0001 | Usage | Error | DiagnosticDescriptors
TKSMPL0002 | Usage | Error | DiagnosticDescriptors
TKSMPL0003 | Usage | Error | DiagnosticDescriptors
TKSMPL0004 | Usage | Error | DiagnosticDescriptors
TKSMPL0005 | Usage | Error | DiagnosticDescriptors
TKSMPL0006 | Usage | Error | DiagnosticDescriptors
TKSMPL0007 | Usage | Error | DiagnosticDescriptors
TKSMPL0008 | Usage | Error | DiagnosticDescriptors
TKSMPL0009 | Usage | Error | DiagnosticDescriptors
TKSMPL0010 | Usage | Error | DiagnosticDescriptors
TKSMPL0011 | Usage | Error | DiagnosticDescriptors
TKSMPL0012 | Usage | Error | DiagnosticDescriptors
TKSMPL0013 | Usage | Warning | DiagnosticDescriptors
TKSMPL0014 | Usage | Warning | DiagnosticDescriptors
TKSMPL0015 | Usage | Error | DiagnosticDescriptors
10 changes: 8 additions & 2 deletions CommunityToolkit.Tooling.SampleGen/CommunityToolkit.Tooling.SampleGen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,20 @@
<Nullable>enable</Nullable>
<WarningsAsErrors>nullable</WarningsAsErrors>
<LangVersion>11.0</LangVersion>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\GlobalUsings.cs" Link="GlobalUsings.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<SlnGenSolutionItem Remove="AnalyzerReleases.Shipped.md" />
<SlnGenSolutionItem Remove="AnalyzerReleases.Unshipped.md" />
</ItemGroup>
</Project>
Loading
Loading