Skip to content

Commit a930ffe

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into darc-release/8.0.1xx-55b76dcd-a9e6-4726-83fa-36ad828278bb
2 parents 534eb84 + cb6781b commit a930ffe

File tree

5 files changed

+75
-33
lines changed

5 files changed

+75
-33
lines changed

‎NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
<!-- End: Package sources from dotnet-emsdk -->
1212
<!-- Begin: Package sources from dotnet-format -->
1313
<add key="darc-pub-dotnet-format-b252c60" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-format-b252c60-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-9/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-format-b252c60-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-8/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-format-b252c60-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-7/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-format-b252c60-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-6/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-format-b252c60-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-5/nuget/v3/index.json" />
1419
<add key="darc-pub-dotnet-format-b252c60-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-4/nuget/v3/index.json" />
1520
<add key="darc-pub-dotnet-format-b252c60-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-3/nuget/v3/index.json" />
1621
<add key="darc-pub-dotnet-format-b252c60-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-b252c608-2/nuget/v3/index.json" />
@@ -41,6 +46,7 @@
4146
<add key="darc-pub-dotnet-templating-5cab537-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5cab5378-3/nuget/v3/index.json" />
4247
<add key="darc-pub-dotnet-templating-5cab537-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5cab5378-2/nuget/v3/index.json" />
4348
<add key="darc-pub-dotnet-templating-5cab537-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5cab5378-1/nuget/v3/index.json" />
49+
<add key="darc-pub-dotnet-templating-8938081" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-89380817/nuget/v3/index.json" />
4450
<!-- End: Package sources from dotnet-templating -->
4551
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4652
<add key="darc-int-dotnet-windowsdesktop-28ae95b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.108">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.109">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>5cab53780897ef7a8e212e10732af54c0a7e597f</Sha>
6+
<Sha>893808174d1839f4ffb7c764c8d200034f34cb99</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.108-servicing.24353.3">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.109-servicing.24406.6">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>5cab53780897ef7a8e212e10732af54c0a7e597f</Sha>
10+
<Sha>893808174d1839f4ffb7c764c8d200034f34cb99</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.108-servicing.24353.3">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.109-servicing.24406.6">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>5cab53780897ef7a8e212e10732af54c0a7e597f</Sha>
14+
<Sha>893808174d1839f4ffb7c764c8d200034f34cb99</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.7">
@@ -82,34 +82,34 @@
8282
<Sha>b252c608794019761c3f0eb50d142db1ff1b6a2e</Sha>
8383
<SourceBuild RepoName="format" ManagedOnly="true" />
8484
</Dependency>
85-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.24362.3">
85+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.24378.1">
8686
<Uri>https://github.com/dotnet/roslyn</Uri>
87-
<Sha>2975b0a592ac27549e1b9d0e786243f9cb569316</Sha>
87+
<Sha>302f7876e6784ee3689fb28bb3480759b6c31658</Sha>
8888
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
8989
</Dependency>
90-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.24362.3">
90+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.24378.1">
9191
<Uri>https://github.com/dotnet/roslyn</Uri>
92-
<Sha>2975b0a592ac27549e1b9d0e786243f9cb569316</Sha>
92+
<Sha>302f7876e6784ee3689fb28bb3480759b6c31658</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.24362.3">
94+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-7.24378.1">
9595
<Uri>https://github.com/dotnet/roslyn</Uri>
96-
<Sha>2975b0a592ac27549e1b9d0e786243f9cb569316</Sha>
96+
<Sha>302f7876e6784ee3689fb28bb3480759b6c31658</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.24362.3">
98+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0-7.24378.1">
9999
<Uri>https://github.com/dotnet/roslyn</Uri>
100-
<Sha>2975b0a592ac27549e1b9d0e786243f9cb569316</Sha>
100+
<Sha>302f7876e6784ee3689fb28bb3480759b6c31658</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.24362.3">
102+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0-7.24378.1">
103103
<Uri>https://github.com/dotnet/roslyn</Uri>
104-
<Sha>2975b0a592ac27549e1b9d0e786243f9cb569316</Sha>
104+
<Sha>302f7876e6784ee3689fb28bb3480759b6c31658</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.24362.3">
106+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-7.24378.1">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108-
<Sha>2975b0a592ac27549e1b9d0e786243f9cb569316</Sha>
108+
<Sha>302f7876e6784ee3689fb28bb3480759b6c31658</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.24362.3">
110+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.8.0-7.24378.1">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>2975b0a592ac27549e1b9d0e786243f9cb569316</Sha>
112+
<Sha>302f7876e6784ee3689fb28bb3480759b6c31658</Sha>
113113
</Dependency>
114114
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.7-servicing.24314.2">
115115
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>

‎eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212
<!-- Repo Version Information -->
1313
<PropertyGroup>
14-
<VersionPrefix>8.0.108</VersionPrefix>
14+
<VersionPrefix>8.0.109</VersionPrefix>
1515
<!-- Enable to remove prerelease label. -->
1616
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
@@ -134,13 +134,13 @@
134134
</PropertyGroup>
135135
<PropertyGroup>
136136
<!-- Dependencies from https://github.com/dotnet/templating -->
137-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.108</MicrosoftTemplateEngineAbstractionsPackageVersion>
137+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.109</MicrosoftTemplateEngineAbstractionsPackageVersion>
138138
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
139139
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
140140
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
141141
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
142142
<!-- test dependencies -->
143-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.108-servicing.24353.3</MicrosoftTemplateEngineMocksPackageVersion>
143+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.109-servicing.24406.6</MicrosoftTemplateEngineMocksPackageVersion>
144144
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
145145
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
146146
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -151,13 +151,13 @@
151151
</PropertyGroup>
152152
<PropertyGroup>
153153
<!-- Dependencies from https://github.com/dotnet/roslyn -->
154-
<MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.24362.3</MicrosoftNetCompilersToolsetPackageVersion>
155-
<MicrosoftCodeAnalysisPackageVersion>4.8.0-7.24362.3</MicrosoftCodeAnalysisPackageVersion>
156-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.24362.3</MicrosoftCodeAnalysisCSharpPackageVersion>
157-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.24362.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
158-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.24362.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
159-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.24362.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
160-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.24362.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
154+
<MicrosoftNetCompilersToolsetPackageVersion>4.8.0-7.24378.1</MicrosoftNetCompilersToolsetPackageVersion>
155+
<MicrosoftCodeAnalysisPackageVersion>4.8.0-7.24378.1</MicrosoftCodeAnalysisPackageVersion>
156+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.8.0-7.24378.1</MicrosoftCodeAnalysisCSharpPackageVersion>
157+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.8.0-7.24378.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
158+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.8.0-7.24378.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
159+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.8.0-7.24378.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
160+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.8.0-7.24378.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
161161
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
162162
</PropertyGroup>
163163
<PropertyGroup>

‎src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,42 @@
188188
</PublishContainerDependsOn>
189189
</PropertyGroup>
190190

191-
<!-- TODO: change this comparison to include $(EnableSdkContainerSupport) == true when console apps Import the Publish SDK -->
191+
<Target Name="_CheckContainersPackage" AfterTargets="Build">
192+
<PropertyGroup>
193+
<!-- facts to base on comparisons on -->
194+
<_ContainersPackageIdentity>Microsoft.NET.Build.Containers</_ContainersPackageIdentity>
195+
<_WebDefaultSdkVersion>7.0.300</_WebDefaultSdkVersion>
196+
<_WorkerDefaultSdkVersion>8.0.100</_WorkerDefaultSdkVersion>
197+
<_ConsoleDefaultSdkVersion>8.0.200</_ConsoleDefaultSdkVersion>
198+
199+
<!-- capability detection for the executing SDK -->
200+
<_SdkCanPublishWeb>$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '$(_WebDefaultSdkVersion)'))</_SdkCanPublishWeb>
201+
<_SdkCanPublishWorker>$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '$(_WorkerDefaultSdkVersion)'))</_SdkCanPublishWorker>
202+
<_SdkCanPublishConsole>$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '$(_ConsoleDefaultSdkVersion)'))</_SdkCanPublishConsole>
203+
204+
<!-- capability detection for the executing project -->
205+
<_ContainerPackageIsPresent>false</_ContainerPackageIsPresent>
206+
<_ContainerPackageIsPresent Condition="@(PackageReference->AnyHaveMetadataValue('Identity', '$(_ContainersPackageIdentity)'))">true</_ContainerPackageIsPresent>
207+
<_IsWebProject>false</_IsWebProject>
208+
<_IsWebProject Condition="@(ProjectCapability->AnyHaveMetadataValue('Identity', 'DotNetCoreWeb'))">true</_IsWebProject>
209+
<_IsWorkerProject>false</_IsWorkerProject>
210+
<_IsWorkerProject Condition="@(ProjectCapability->AnyHaveMetadataValue('Identity', 'DotNetCoreWorker'))">true</_IsWorkerProject>
211+
</PropertyGroup>
212+
213+
<Warning
214+
Condition="$(_ContainerPackageIsPresent)
215+
and (
216+
($(_SdkCanPublishWeb) and $(_IsWebProject)) or
217+
($(_SdkCanPublishWorker) and $(_IsWorkerProject)) or
218+
($(_SdkCanPublishConsole) and '$(EnableSdkContainerSupport)' == 'true')
219+
)"
220+
Text="The $(_ContainersPackageIdentity) NuGet package is explicitly referenced but the current SDK can natively publish the project as a container. Consider removing the package reference to $(_ContainersPackageIdentity) because it is no longer needed." />
221+
222+
<PropertyGroup>
223+
<EnableSdkContainerSupport Condition="'@(ContainersPackage)' != ''">true</EnableSdkContainerSupport>
224+
</PropertyGroup>
225+
</Target>
226+
192227
<Target Name="PublishContainer"
193228
DependsOnTargets="$(PublishContainerDependsOn)"
194229
Condition="'$(IsPublishable)' == 'true'">

‎src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage
293293

294294
if (addPackageReference)
295295
{
296-
commandResult.Should().HaveStdOutContaining("warning : Microsoft.NET.Build.Containers NuGet package is explicitly referenced. Consider removing the package reference to Microsoft.NET.Build.Containers as it is now part of .NET SDK.");
296+
commandResult.Should().HaveStdOutContaining("warning : The Microsoft.NET.Build.Containers NuGet package is explicitly referenced but the current SDK can natively publish the project as a container. Consider removing the package reference to Microsoft.NET.Build.Containers because it is no longer needed.");
297297
}
298298
else
299299
{
@@ -443,7 +443,8 @@ public void EndToEnd_NoAPI_Console()
443443
$"/p:ContainerRegistry={DockerRegistryManager.LocalRegistry}",
444444
$"/p:ContainerRepository={imageName}",
445445
$"/p:RuntimeFrameworkVersion=8.0.0-preview.3.23174.8",
446-
$"/p:ContainerImageTag={imageTag}")
446+
$"/p:ContainerImageTag={imageTag}",
447+
"/p:EnableSdkContainerSupport=true")
447448
.WithEnvironmentVariable("NUGET_PACKAGES", privateNuGetAssets.FullName)
448449
.WithWorkingDirectory(newProjectDir.FullName)
449450
.Execute()

0 commit comments

Comments
 (0)