Skip to content

Commit d462c03

Browse files
PWagner1PWagner1
authored
Merge pull request #240 from Krypton-Suite/gold
Gold
2 parents 3c0883d + ab87da8 commit d462c03

12 files changed

Lines changed: 78 additions & 30 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,17 @@ jobs:
3535
9.0.x
3636
10.0.x
3737
38-
# global.json dynamically generate
39-
- name: Force .NET 10 SDK via global.json
38+
# .NET 11 (Preview)
39+
- name: Setup .NET 11 (Preview)
40+
uses: actions/setup-dotnet@v5
41+
with:
42+
dotnet-version: 11.0.x
43+
dotnet-quality: preview
44+
45+
# global.json dynamically generate (use latest SDK available)
46+
- name: Force .NET 11 SDK via global.json
4047
run: |
41-
$sdkVersion = (dotnet --list-sdks | Select-String "10.0").ToString().Split(" ")[0]
48+
$sdkVersion = (dotnet --list-sdks | Select-String "11.0").ToString().Split(" ")[0]
4249
Write-Output "Using SDK $sdkVersion"
4350
@"
4451
{

‎.github/workflows/nightly.yml‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,28 +109,21 @@ jobs:
109109
9.0.x
110110
10.0.x
111111
112-
# .NET 11 (will auto-upgrade from preview to GA when available)
113-
- name: Setup .NET 11
114-
id: setup_dotnet_11
115-
if: steps.nightly_release_kill_switch.outputs.enabled == 'true' && steps.check_changes.outputs.has_changes == 'true'
112+
# .NET 11 (Preview)
113+
- name: Setup .NET 11 (Preview)
116114
uses: actions/setup-dotnet@v5
117115
with:
118116
dotnet-version: 11.0.x
119-
continue-on-error: true
120-
121-
- name: Note .NET 11 Status
122-
if: steps.nightly_release_kill_switch.outputs.enabled == 'true' && steps.check_changes.outputs.has_changes == 'true' && steps.setup_dotnet_11.outcome == 'failure'
123-
run: |
124-
Write-Host "::notice::.NET 11 is not yet available - falling back to .NET 10 (this is expected)"
117+
dotnet-quality: preview
125118

126119
# global.json dynamically generate (use latest SDK available)
127-
- name: Force .NET 10 SDK via global.json
120+
- name: Force .NET 11 SDK via global.json
128121
if: steps.nightly_release_kill_switch.outputs.enabled == 'true' && steps.check_changes.outputs.has_changes == 'true'
129122
run: |
130-
$sdkVersion = (dotnet --list-sdks | Select-String "10.0").ToString().Split(" ")[0]
123+
$sdkVersion = (dotnet --list-sdks | Select-String "11.0").ToString().Split(" ")[0]
131124
if (-not $sdkVersion) {
132-
# Fallback to .NET 8 if .NET 10 is not available
133-
$sdkVersion = (dotnet --list-sdks | Select-String "8.0").ToString().Split(" ")[0]
125+
# Fallback to .NET 10 if .NET 11 is not available
126+
$sdkVersion = (dotnet --list-sdks | Select-String "10.0").ToString().Split(" ")[0]
134127
}
135128
Write-Output "Using SDK $sdkVersion"
136129
@"
@@ -169,7 +162,7 @@ jobs:
169162
$packageId = "Microsoft.Web.WebView2"
170163
$latestVersion = $null
171164
try {
172-
$searchUrl = "https://azuresearch-usnc.nuget.org/query?q=$packageId&prerelease=false&semVerLevel=2.0.0&take=1"
165+
$searchUrl = "https://azuresearch-usnc.nuget.org/query?q=$packageId&prerelease=true&semVerLevel=2.0.0&take=1"
173166
$searchResponse = Invoke-RestMethod -Uri $searchUrl -Method Get
174167
if ($searchResponse.data -and $searchResponse.data.Count -gt 0) {
175168
$latestVersion = $searchResponse.data[0].version

‎.github/workflows/release.yml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -870,12 +870,18 @@ jobs:
870870
9.0.x
871871
10.0.x
872872
873-
# global.json dynamically generate
874-
- name: Force .NET 10 SDK via global.json
875-
# Kill switch check
873+
# .NET 11 (Preview)
874+
- name: Setup .NET 11 (Preview)
875+
uses: actions/setup-dotnet@v5
876+
with:
877+
dotnet-version: 11.0.x
878+
dotnet-quality: preview
879+
880+
# global.json dynamically generate (use latest SDK available)
881+
- name: Force .NET 11 SDK via global.json
876882
if: steps.canary_release_kill_switch.outputs.enabled == 'true'
877883
run: |
878-
$sdkVersion = (dotnet --list-sdks | Select-String "10.0").ToString().Split(" ")[0]
884+
$sdkVersion = (dotnet --list-sdks | Select-String "11.0").ToString().Split(" ")[0]
879885
Write-Output "Using SDK $sdkVersion"
880886
@"
881887
{
@@ -1174,12 +1180,19 @@ jobs:
11741180
9.0.x
11751181
10.0.x
11761182
1177-
# global.json dynamically generate
1178-
- name: Force .NET 10 SDK via global.json
1183+
# .NET 11 (Preview)
1184+
- name: Setup .NET 11 (Preview)
1185+
uses: actions/setup-dotnet@v5
1186+
with:
1187+
dotnet-version: 11.0.x
1188+
dotnet-quality: preview
1189+
1190+
# global.json dynamically generate (use latest SDK available)
1191+
- name: Force .NET 11 SDK via global.json
11791192
# Kill switch check
11801193
if: steps.nightly_release_kill_switch.outputs.enabled == 'true'
11811194
run: |
1182-
$sdkVersion = (dotnet --list-sdks | Select-String "10.0").ToString().Split(" ")[0]
1195+
$sdkVersion = (dotnet --list-sdks | Select-String "11.0").ToString().Split(" ")[0]
11831196
Write-Output "Using SDK $sdkVersion"
11841197
@"
11851198
{

‎Source/Current/Krypton Components/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
<!-- Configure NuGet package output to separate directory for easier management -->
4848
<PropertyGroup>
49-
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\Bin\Packages\$(Configuration)\</PackageOutputPath>
49+
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\Bin\Packages\$(Configuration)\</PackageOutputPath>
5050
</PropertyGroup>
5151

5252
<Choose>

‎Source/Current/Krypton Components/Krypton.Utilities/Krypton.Utilities.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@
5252
<SpecificVersion>True</SpecificVersion>
5353
<Version>4.0.0.0</Version>
5454
</Reference>
55+
<Reference Include="System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" Condition="$(TargetFramework.StartsWith('net4'))">
56+
<SpecificVersion>True</SpecificVersion>
57+
<Version>4.0.0.0</Version>
58+
</Reference>
59+
<Reference Include="System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" Condition="$(TargetFramework.StartsWith('net4'))">
60+
<SpecificVersion>True</SpecificVersion>
61+
<Version>4.0.0.0</Version>
62+
</Reference>
5563
</ItemGroup>
5664

5765
<!-- WebView2: bundled DLLs in Lib/WebView2 (all target frameworks). Run Scripts\WebVew2\Populate-BundledWebView2.cmd to populate. -->
@@ -90,6 +98,7 @@
9098
<ProjectReference Include="..\Krypton.Workspace\Krypton.Workspace 2022.csproj" />
9199
</ItemGroup>
92100

101+
93102
<ItemGroup>
94103
<EmbeddedResource Update="Components\KryptonSearchBox\Resource Files\SearchBoxImageResources.resx">
95104
<Generator>ResXFileCodeGenerator</Generator>

‎Source/Testing/Krypton Components/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
<!-- Configure NuGet package output to separate directory for easier management -->
4848
<PropertyGroup>
49-
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\Artefacts\Packages\$(Configuration)\</PackageOutputPath>
49+
<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\..\Artefacts\Packages\$(Configuration)\</PackageOutputPath>
5050
</PropertyGroup>
5151

5252
<Choose>

‎Source/Testing/Krypton Components/Krypton Toolkit Suite.slnx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
</Folder>
9292
<Folder Name="/Source/">
9393
<Project Path="Krypton.Docking/Krypton.Docking.csproj" />
94+
<Project Path="Krypton.Navigator.Utilities/Krypton.Navigator.Utilities.csproj" />
9495
<Project Path="Krypton.Navigator/Krypton.Navigator.csproj" />
9596
<Project Path="Krypton.Ribbon/Krypton.Ribbon.csproj" />
9697
<Project Path="Krypton.Standard.Toolkit/Krypton.Standard.Toolkit.csproj" Id="059d362b-e508-4241-8c93-4f2a0a4c8f6a">

‎Source/Testing/Krypton Components/Krypton.Toolkit/Tooling/DebugTools.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,13 @@ public static Exception NotImplemented(string? outOfRange,
8484
if (IsGitHubReportingConfigured)
8585
{
8686
var context = $"**Not Implemented context**\r\nMethod: {callingMethod}\r\nFile: {callingFilePath}\r\nLine: {lineNumber}";
87-
KryptonGitHubIssueReportDialog.Show(Form.ActiveForm, _secretKey!, _configFilePath, context);
87+
using var secureKey = new SecureString();
88+
foreach (char c in _secretKey!)
89+
{
90+
secureKey.AppendChar(c);
91+
}
92+
secureKey.MakeReadOnly();
93+
KryptonGitHubIssueReportDialog.Show(Form.ActiveForm, secureKey, _configFilePath, context);
8894
}
8995
else
9096
{

‎Source/Testing/Krypton Components/Krypton.Utilities/Components/KryptonBugReportingDialog/General/BugReportingHelper.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,17 @@ public static void ShowExceptionWithBugReporting(Exception exception, BugReportE
4848
public static void ShowExceptionWithBugReporting(Exception exception, string githubSecretKey,
4949
Color? highlightColor = null, bool? showCopyButton = null, bool? showSearchBox = null, string? githubConfigPath = null)
5050
{
51+
SecureString? secureKey = null;
52+
if (githubSecretKey != null)
53+
{
54+
secureKey = new SecureString();
55+
foreach (char c in githubSecretKey)
56+
{
57+
secureKey.AppendChar(c);
58+
}
59+
}
5160
Krypton.Toolkit.KryptonExceptionDialog.Show(exception, highlightColor, showCopyButton, showSearchBox,
52-
null, githubSecretKey, githubConfigPath);
61+
null, secureKey, githubConfigPath);
5362
}
5463

5564
/// <summary>

‎Source/Testing/Krypton Components/Krypton.Utilities/Components/KryptonQRCode/Controls Toolkit/KryptonQRCode.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using System.ComponentModel;
1212
using System.Drawing;
1313
using System.Drawing.Drawing2D;
14+
using System.Windows.Forms;
1415

1516
using Krypton.Toolkit;
1617

0 commit comments

Comments
 (0)