-
Notifications
You must be signed in to change notification settings - Fork 10.1k
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
Shorten package version properties #27784
Conversation
FYI this big change is why I temporarily disabled our Maestro++ subscriptions for the master branch. Will enable them again once this is in i.e. after we can avoid massive conflicts. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good assuming there's nothing trickier than what you called out in the description
Quick note on what still spells out "packageversion": The main thing is of course the |
Help please @JamesNK and @pranavkm. I'm confused by the public static T GetOptionalProperty<T>(JObject json, string property, JTokenType expectedType = JTokenType.None, T defaultValue = default)
{
var prop = json[property];
if (prop == null)
{
return defaultValue;
}
return GetValue<T>(property, expectedType, prop);
} As I read this, VS Code (though not the CI build) also reports the same error later in the file: public static string? ReadAsString(JsonTextReader reader, string propertyName)
{
reader.Read();
if (reader.TokenType != JsonToken.String)
{
throw new InvalidDataException($"Expected '{propertyName}' to be of type {JTokenType.String}.");
}
return reader.Value?.ToString();
} This looks even stranger to me because the return is nullable. |
I recall seeing the above error when building this branch locally but it wasn't nearly as consistent. New warnings or errors are likely occurring because we're now using our configured version of Microsoft.CodeAnalysis.CSharp and not Arcade's older choice. But, as I said, I don't "get" that particular |
You can delete the
|
Thanks @BrennanConroy the pipeline is running much smoother now 😺 |
- `$(...PackageVersion)` -> `$(...Version)` - inspired by a similar dotnet/efcore change - aligns names with Arcade SDK, meaning our values apply consistently
- restore Arcade's control of `$(MicrosoftSymbolUploaderBuildTaskVersion>)` - would otherwise result in a version downgrade
- avoid using an older toolset - now successfully overriding Arcade value
- delete the unused `GetOptionalProperty(...)` method
- `%(ReferencePathWithRefAssemblies.NuGetPackageVersion)` is the correct name
8eff07c
to
61c894d
Compare
- adjust version properties to align with 44c0e66 / dotnet#27784
…th other non-shipping packages from dotnet/runtime to get a non-shipping version. (#27737) * Remove usage of the Microsoft.NETCore.Internal package and replace with other non-shipping packages from dotnet/runtime to get a non-shipping version. * Use BrowserDebugHost as the only sentinel package. * Apply suggestions from code review - adjust version properties to align with 44c0e66 / #27784 Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
* Shorten package version properties - `$(...PackageVersion)` -> `$(...Version)` - inspired by a similar dotnet/efcore change - aligns names with Arcade SDK, meaning our values apply consistently * Remove unused PublishSymbols.proj and related property - restore Arcade's control of `$(MicrosoftSymbolUploaderBuildTaskVersion>)` - would otherwise result in a version downgrade * Update `$(MicrosoftNetCompilersToolsetVersion)` to match Arcade's value - avoid using an older toolset - now successfully overriding Arcade value * Avoid an odd `CS8603` error - delete the unused `GetOptionalProperty(...)` method * Correct an unintentional change reading package metadata - `%(ReferencePathWithRefAssemblies.NuGetPackageVersion)` is the correct name Commit migrated from dotnet/aspnetcore@44c0e6651e38
$(...PackageVersion)
->$(...Version)
Remove unused PublishSymbols.proj and related property
$(MicrosoftSymbolUploaderBuildTaskVersion>)
Update
$(MicrosoftNetCompilersToolsetVersion)
to match Arcade's value