Skip to content

Commit 3da118d

Browse files
anvillananvillan
authored
Merge branch 'main' into dev/anvillan/publish_webjob_linux
2 parents 884bbaa + 67eae2f commit 3da118d

File tree

5 files changed

+57
-57
lines changed

5 files changed

+57
-57
lines changed

‎eng/Version.Details.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -93,43 +93,43 @@
9393
<Sha>02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
96-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-1.24366.6">
96+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-1.24372.7">
9797
<Uri>https://github.com/dotnet/roslyn</Uri>
98-
<Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
98+
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
9999
</Dependency>
100100
<!-- Intermediate is necessary for source build. -->
101-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-1.24366.6">
101+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-1.24372.7">
102102
<Uri>https://github.com/dotnet/roslyn</Uri>
103-
<Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
103+
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
104104
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
105105
</Dependency>
106-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-1.24366.6">
106+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-1.24372.7">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108-
<Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
108+
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-1.24366.6">
110+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-1.24372.7">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
112+
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-1.24366.6">
114+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-1.24372.7">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
116+
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-1.24366.6">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-1.24372.7">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
120+
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-1.24366.6">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-1.24372.7">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
124+
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-1.24366.6">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-1.24372.7">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
128+
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-1.24366.6">
130+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-1.24372.7">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
132+
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
133133
</Dependency>
134134
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-preview.7.24369.10">
135135
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -246,26 +246,26 @@
246246
<Uri>https://github.com/dotnet/runtime</Uri>
247247
<Sha>1f70f0cc663b5d45f77840e9728386e5fa7944f9</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.7.24368.1">
249+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.7.24372.1">
250250
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
251-
<Sha>90f32e0fbb8fdcb9701942a0ea973ad4fe4883e7</Sha>
251+
<Sha>8c30fff21aec51c13d23cee7d0a7aa9fdba1c831</Sha>
252252
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
253253
</Dependency>
254-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24368.1">
254+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24372.1">
255255
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
256-
<Sha>90f32e0fbb8fdcb9701942a0ea973ad4fe4883e7</Sha>
256+
<Sha>8c30fff21aec51c13d23cee7d0a7aa9fdba1c831</Sha>
257257
</Dependency>
258-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.7.24368.1">
258+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.7.24372.1">
259259
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
260-
<Sha>90f32e0fbb8fdcb9701942a0ea973ad4fe4883e7</Sha>
260+
<Sha>8c30fff21aec51c13d23cee7d0a7aa9fdba1c831</Sha>
261261
</Dependency>
262-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.7.24368.1">
262+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.7.24372.1">
263263
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
264-
<Sha>90f32e0fbb8fdcb9701942a0ea973ad4fe4883e7</Sha>
264+
<Sha>8c30fff21aec51c13d23cee7d0a7aa9fdba1c831</Sha>
265265
</Dependency>
266-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-preview.7.24367.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
266+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-preview.7.24372.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
267267
<Uri>https://github.com/dotnet/wpf</Uri>
268-
<Sha>8529feb7ce7dcb68ef581a2a2e6f8e6bff7290e0</Sha>
268+
<Sha>1bb5c431ea0474f5b433b1d766a303167d640ccd</Sha>
269269
</Dependency>
270270
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.7.24369.10">
271271
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -382,13 +382,13 @@
382382
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
383383
</Dependency>
384384
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
385-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.7.24366.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
385+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.7.24368.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
386386
<Uri>https://github.com/dotnet/winforms</Uri>
387-
<Sha>bb601b3242ccbf5d8a77a44af27a374f677be8d6</Sha>
387+
<Sha>1fe50581398f481ac2abaa470b79c565f2b42e41</Sha>
388388
</Dependency>
389-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.7.24367.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
389+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.7.24372.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
390390
<Uri>https://github.com/dotnet/wpf</Uri>
391-
<Sha>8529feb7ce7dcb68ef581a2a2e6f8e6bff7290e0</Sha>
391+
<Sha>1bb5c431ea0474f5b433b1d766a303167d640ccd</Sha>
392392
</Dependency>
393393
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24317.2">
394394
<Uri>https://github.com/dotnet/xdt</Uri>
@@ -448,9 +448,9 @@
448448
<Sha>4d5ba7206ed1d56612b36560334494652ed486b2</Sha>
449449
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
450450
</Dependency>
451-
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.24366.1">
451+
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.24368.1">
452452
<Uri>https://github.com/dotnet/deployment-tools</Uri>
453-
<Sha>790d2fd96379448c91306c67768b41521a4c130f</Sha>
453+
<Sha>6935df19a5042d9e0c286122973a76ef7c66242b</Sha>
454454
</Dependency>
455455
<Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.24215.3">
456456
<Uri>https://github.com/dotnet/sourcelink</Uri>
@@ -483,9 +483,9 @@
483483
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
484484
</Dependency>
485485
<!-- Intermediate is necessary for source build. -->
486-
<Dependency Name="Microsoft.SourceBuild.Intermediate.deployment-tools" Version="9.0.0-preview.1.24366.1">
486+
<Dependency Name="Microsoft.SourceBuild.Intermediate.deployment-tools" Version="9.0.0-preview.1.24368.1">
487487
<Uri>https://github.com/dotnet/deployment-tools</Uri>
488-
<Sha>790d2fd96379448c91306c67768b41521a4c130f</Sha>
488+
<Sha>6935df19a5042d9e0c286122973a76ef7c66242b</Sha>
489489
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
490490
</Dependency>
491491
<!-- Intermediate is necessary for source build. -->

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
8080
<SystemCommandLineVersion>2.0.0-beta4.24324.3</SystemCommandLineVersion>
8181
<SystemCommandLineRenderingVersion>0.4.0-alpha.24324.3</SystemCommandLineRenderingVersion>
82-
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24366.1</MicrosoftDeploymentDotNetReleasesVersion>
82+
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24368.1</MicrosoftDeploymentDotNetReleasesVersion>
8383
<MicrosoftDiaSymReaderVersion>2.2.0-beta.24327.2</MicrosoftDiaSymReaderVersion>
8484
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
8585
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
@@ -110,7 +110,7 @@
110110
</PropertyGroup>
111111
<PropertyGroup>
112112
<!-- Dependency from https://github.com/dotnet/winforms -->
113-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24366.8</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
113+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24368.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
114114
</PropertyGroup>
115115
<PropertyGroup>
116116
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -161,10 +161,10 @@
161161
</PropertyGroup>
162162
<PropertyGroup>
163163
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
164-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24368.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
165-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24368.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
166-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24368.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
167-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24368.1</MicrosoftWindowsDesktopAppRefPackageVersion>
164+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24372.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
165+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24372.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
166+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24372.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
167+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24372.1</MicrosoftWindowsDesktopAppRefPackageVersion>
168168
</PropertyGroup>
169169
<PropertyGroup>
170170
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -230,14 +230,14 @@
230230
</PropertyGroup>
231231
<PropertyGroup>
232232
<!-- Dependencies from https://github.com/dotnet/roslyn -->
233-
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24366.6</MicrosoftNetCompilersToolsetVersion>
234-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24366.6</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisPackageVersion>
236-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpPackageVersion>
237-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
233+
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24372.7</MicrosoftNetCompilersToolsetVersion>
234+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24372.7</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisPackageVersion>
236+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisCSharpPackageVersion>
237+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
241241
</PropertyGroup>
242242
<PropertyGroup>
243243
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -263,8 +263,8 @@
263263
</PropertyGroup>
264264
<PropertyGroup>
265265
<!-- Dependencies from https://github.com/dotnet/wpf -->
266-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24367.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
267-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24367.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
266+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24372.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
267+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24372.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
268268
</PropertyGroup>
269269
<PropertyGroup Label="Runtime and Apphost aliases">
270270
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->

‎test/UnitTests.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<SDKCustomXUnitProject Condition="'$(RunAoTTests)' != 'true'" Include="**\*.Tests.csproj" Exclude="**\*.AoT.Tests.csproj;**\core-sdk-tasks.Tests.csproj;TestAssets\**\*.Tests.csproj" />
15+
<SDKCustomXUnitProject Condition="'$(RunAoTTests)' != 'true'" Include="**\*.Tests.csproj" Exclude="**\*.AoT.Tests.csproj;TestAssets\**\*.Tests.csproj" />
1616
<!--containers tests end with UnitTests and IntegrationTests, therefore included manually -->
1717
<SDKCustomXUnitProject Condition="'$(RunAoTTests)' != 'true'" Include="containerize.UnitTests\containerize.UnitTests.csproj" />
1818
<SDKCustomXUnitProject Condition="'$(RunAoTTests)' != 'true' And $(_AGENTOSNAME) != 'Windows_NT_FullFramework'" Include="Microsoft.NET.Build.Containers.IntegrationTests\Microsoft.NET.Build.Containers.IntegrationTests.csproj" />

‎test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using Microsoft.DotNet.Cli.Build;
22

3-
namespace EndToEnd
3+
namespace Microsoft.CoreSdkTasks.Tests
44
{
5-
public class CalculateTemplateVersionsTests
5+
public class CalculateTemplateVersionsTests(ITestOutputHelper log) : SdkTest(log)
66
{
77
[Fact]
88
public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInStableBuilds()

‎test/core-sdk-tasks.Tests/GenerateDefaultRuntimeFrameworkVersionTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using Microsoft.DotNet.Cli.Build;
22

3-
namespace EndToEnd
3+
namespace Microsoft.CoreSdkTasks.Tests
44
{
5-
public class GenerateDefaultRuntimeFrameworkVersionTests
5+
public class GenerateDefaultRuntimeFrameworkVersionTests(ITestOutputHelper log) : SdkTest(log)
66
{
77
[Theory]
88
[InlineData("3.0.0-rtm", "3.0.0-rtm")]

0 commit comments

Comments
 (0)