Skip to content

Revert "Update SDK" #44730

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

Merged
merged 1 commit into from
Oct 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
<PropertyGroup Label="Manual">
<!-- Bumping the Roslyn version used in order to ingest the new runtime source generators -->
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
<MicrosoftNetCompilersToolsetVersion>4.5.0-1.22517.9</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetVersion>4.4.0-3.22452.8</MicrosoftNetCompilersToolsetVersion>
<!-- DiagnosticAdapter package pinned temporarily until migrated/deprecated -->
<MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.4.20180.4</MicrosoftExtensionsDiagnosticAdapterVersion>
<!-- Build tool dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "8.0.100-alpha.1.22524.1"
"version": "8.0.100-alpha.1.22480.9"
},
"tools": {
"dotnet": "8.0.100-alpha.1.22524.1",
"dotnet": "8.0.100-alpha.1.22480.9",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
Expand Down
2 changes: 1 addition & 1 deletion src/Features/JsonPatch/src/Operations/Operation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Operations;

public class Operation : OperationBase
{
[JsonProperty(nameof(value))]
[JsonProperty("value")]
public object value { get; set; }

public Operation()
Expand Down
6 changes: 3 additions & 3 deletions src/Features/JsonPatch/src/Operations/OperationBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ public OperationType OperationType
}
}

[JsonProperty(nameof(path))]
[JsonProperty("path")]
public string path { get; set; }

[JsonProperty(nameof(op))]
[JsonProperty("op")]
public string op
{
get
Expand All @@ -42,7 +42,7 @@ public string op
}
}

[JsonProperty(nameof(from))]
[JsonProperty("from")]
public string from { get; set; }

public OperationBase()
Expand Down
3 changes: 3 additions & 0 deletions src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@ internal void Serialize(Utf8JsonWriter writer)
writer.WritePropertyName(nameof(AllowResponseHeaderCompression));
writer.WriteBooleanValue(AllowResponseHeaderCompression);

writer.WritePropertyName(nameof(EnableAltSvc));
writer.WriteBooleanValue(EnableAltSvc);

writer.WritePropertyName(nameof(IsDevCertLoaded));
writer.WriteBooleanValue(IsDevCertLoaded);

Expand Down