Skip to content

Update SDK #48252

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

Merged
merged 6 commits into from
May 30, 2023
Merged

Update SDK #48252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e86e98
Update SDK
halter73 May 15, 2023
73291db
Update global.json
wtgodbe May 19, 2023
b538452
Update global.json
MackinnonBuck May 22, 2023
64bf75a
Update Directory.Build.props
MackinnonBuck May 22, 2023
492767e
Update global.json
captainsafia May 26, 2023
4182c56
react to sdk breaking change
BrennanConroy May 26, 2023
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/testing/linker/SupportFiles/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<PublishTrimmed>true</PublishTrimmed>
<TrimMode>full</TrimMode>
<PublishSelfContained>true</PublishSelfContained>
<SelfContained>true</SelfContained>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<!-- Enable NuGet static graph evaluation to optimize incremental restore -->
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "8.0.100-preview.5.23257.1"
"version": "8.0.100-preview.5.23275.15"
},
"tools": {
"dotnet": "8.0.100-preview.5.23257.1",
"dotnet": "8.0.100-preview.5.23275.15",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
Expand Down
2 changes: 1 addition & 1 deletion src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public virtual Task<PublishedApplication> Publish(DeploymentParameters deploymen

if (deploymentParameters.ApplicationType == ApplicationType.Standalone)
{
parameters += $" --runtime {GetRuntimeIdentifier(deploymentParameters)}";
parameters += $" --self-contained --runtime {GetRuntimeIdentifier(deploymentParameters)}";
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<!-- ReferenceTestTasks is workaround for https://github.com/dotnet/sdk/issues/2482 -->
<TestAssetPublishProfile Include="Standalone-x64"
Condition=" '$(TargetArchitecture)' != 'arm' "
Properties="RuntimeIdentifier=win-x64;ReferenceTestTasks=false" />
Properties="SelfContained=true;RuntimeIdentifier=win-x64;ReferenceTestTasks=false" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- ReferenceTestTasks is workaround for https://github.com/dotnet/sdk/issues/2482 -->
<TestAssetPublishProfile Include="Standalone-x64"
Condition=" '$(TargetArchitecture)' != 'arm' "
Properties="RuntimeIdentifier=win-x64;ReferenceTestTasks=false" />
Properties="SelfContained=true;RuntimeIdentifier=win-x64;ReferenceTestTasks=false" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...nsions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<_Command Condition=" '$(ProjectAssetsFile)' != '' ">$(_Command) --assets-file "$(ProjectAssetsFile)"</_Command>
<_Command Condition=" '$(PlatformTarget)' != '' ">$(_Command) --platform "$(PlatformTarget)"</_Command>
<_Command Condition=" '$(PlatformTarget)' == '' AND '$(Platform)' != '' ">$(_Command) --platform "$(Platform)"</_Command>
<_Command Condition=" '$(RuntimeIdentifier)' != '' ">$(_Command) --runtime "$(RuntimeIdentifier)"</_Command>
<_Command Condition=" '$(RuntimeIdentifier)' != '' ">$(_Command) --runtime "$(RuntimeIdentifier) --self-contained"</_Command>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know anything about this project. @captainsafia is this ok?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this looks correct based on the breaking change details.

<_Command>$(_Command) $(OpenApiGenerateDocumentsOptions)</_Command>
</PropertyGroup>

Expand Down