-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Net10 upgrade #4288
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.
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
Open
paveliak
wants to merge
13
commits into
actions:main
Choose a base branch
from
paveliak:net10-upgrade
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Net10 upgrade #4288
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
7529690
Net10 upgrade
paveliak e8c0112
Delete BuildConstants.cs as it's generated now
paveliak 35d3c95
Use source generator for BuildConstants
paveliak 1ef8739
Moved git invocation to dev.sh
paveliak f25f28f
Clean generator project
paveliak 46e1757
Be able to run tests in VSCode without dev.sh build/layout
paveliak 679528e
Convert RunnerService project to SDK style
paveliak beeeeba
Add csdevkit to the devcontainer
paveliak 629f73b
Use vs2026 for building windows
paveliak 7351625
Adding restore for the RunnerService project
paveliak f4e23cb
Reverting to windows-latest
paveliak cba9f61
Copilot feedback
paveliak 910429e
Added missing semicolon
paveliak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| using System.Diagnostics; | ||
| using System.IO; | ||
| using System.Runtime.InteropServices; | ||
| using System.Text; | ||
| using Microsoft.CodeAnalysis; | ||
| using Microsoft.CodeAnalysis.Diagnostics; | ||
|
|
||
| namespace GitHub.Runner.Sdk.Generator | ||
| { | ||
| [Generator] | ||
| public sealed class BuildConstantsGenerator : IIncrementalGenerator | ||
| { | ||
| public void Initialize(IncrementalGeneratorInitializationContext context) | ||
| { | ||
| // CommitHash, PackageRuntime, and RunnerVersion come from MSBuild via <CompilerVisibleProperty>. | ||
| IncrementalValueProvider<(string CommitHash, string PackageRuntime, string RunnerVersion)> props = | ||
| context.AnalyzerConfigOptionsProvider.Select((options, _) => | ||
| { | ||
| string projectDir = ValueOrDefault(options.GlobalOptions, "build_property.MSBuildProjectDirectory", ""); | ||
| string commitHash = ValueOrDefault(options.GlobalOptions, "build_property.CommitHash", GetCommitHash(projectDir)); | ||
| string packageRuntime = ValueOrDefault(options.GlobalOptions, "build_property.PackageRuntime", GetRuntimeId()); | ||
| string runnerVersion = ValueOrDefault(options.GlobalOptions, "build_property.RunnerVersion", GetRunnerVersion(projectDir)); | ||
| return (commitHash, packageRuntime, runnerVersion); | ||
| }); | ||
|
|
||
| context.RegisterSourceOutput(props, (ctx, values) => | ||
| { | ||
| ctx.AddSource("BuildConstants.g.cs", BuildSource(values.CommitHash, values.PackageRuntime, values.RunnerVersion)); | ||
| }); | ||
| } | ||
|
|
||
| private static string GetCommitHash(string projectDir) | ||
| { | ||
| using var process = Process.Start(new ProcessStartInfo("git", "rev-parse HEAD") | ||
| { | ||
| WorkingDirectory = projectDir, | ||
| RedirectStandardOutput = true, | ||
| UseShellExecute = false, | ||
| }); | ||
| return process.StandardOutput.ReadToEnd().Trim(); | ||
| } | ||
|
|
||
| private static string GetRunnerVersion(string projectDir) | ||
| { | ||
| return File.ReadAllText(Path.Combine(projectDir, "..", "runnerversion")).Trim(); | ||
| } | ||
paveliak marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| private static string GetRuntimeId() | ||
| { | ||
| string platform = "unknown"; | ||
|
|
||
| if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) | ||
| { | ||
| platform = "win"; | ||
| } | ||
| else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) | ||
| { | ||
| platform = "linux"; | ||
| } | ||
| else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) | ||
| { | ||
| platform = "osx"; | ||
| } | ||
|
|
||
| return $"{platform}-{RuntimeInformation.OSArchitecture}".ToLowerInvariant(); | ||
| } | ||
|
|
||
| private static string ValueOrDefault(AnalyzerConfigOptions options, string name, string defaultValue) | ||
| { | ||
| options.TryGetValue(name, out string? value); | ||
| if (string.IsNullOrEmpty(value)) | ||
| { | ||
| return defaultValue; | ||
| } | ||
|
|
||
| return value!; | ||
| } | ||
|
|
||
| private static string BuildSource(string commitHash, string packageRuntime, string runnerVersion) | ||
| { | ||
| var sb = new StringBuilder(); | ||
| sb.AppendLine("namespace GitHub.Runner.Sdk"); | ||
| sb.AppendLine("{"); | ||
| sb.AppendLine(" /***"); | ||
| sb.AppendLine(" * WARNING: This file is automatically regenerated on layout so the runner can provide version/commit info (do not manually edit it)."); | ||
| sb.AppendLine(" */"); | ||
| sb.AppendLine(" public static class BuildConstants"); | ||
| sb.AppendLine(" {"); | ||
| sb.AppendLine(" public static class Source"); | ||
| sb.AppendLine(" {"); | ||
| sb.AppendLine($" public static readonly string CommitHash = \"{commitHash}\";"); | ||
| sb.AppendLine(" }"); | ||
| sb.AppendLine(); | ||
| sb.AppendLine(" public static class RunnerPackage"); | ||
| sb.AppendLine(" {"); | ||
| sb.AppendLine($" public static readonly string PackageName = \"{packageRuntime}\";"); | ||
| sb.AppendLine($" public static readonly string Version = \"{runnerVersion}\";"); | ||
paveliak marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| sb.AppendLine(" }"); | ||
| sb.AppendLine(" }"); | ||
| sb.AppendLine("}"); | ||
| return sb.ToString(); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <LangVersion>latest</LangVersion> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>disable</ImplicitUsings> | ||
| <!-- Source generators must not be included in consuming projects as a regular reference --> | ||
| <IncludeBuildOutput>false</IncludeBuildOutput> | ||
| <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules> | ||
| <!-- RS2008: release tracking not needed for internal build tools | ||
| RS1035: file/process IO is intentional (reading runnerversion file, running git) --> | ||
| <NoWarn>RS2008;RS1035</NoWarn> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- Roslyn analyzer packages: PrivateAssets=all keeps them from flowing to consumers --> | ||
| <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" /> | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.