Skip to content

Commit b643eed

Browse files
marcpopMSFTmarcpopMSFT
authored
[main] Update dependencies from dotnet/sdk (#16621)
2 parents aea4a03 + 6008e2a commit b643eed

10 files changed

+102
-665
lines changed

‎eng/Version.Details.xml‎

Lines changed: 64 additions & 64 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
</PropertyGroup>
4545
<PropertyGroup>
4646
<!-- Dependency from https://github.com/dotnet/winforms -->
47-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.6.23306.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
47+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.6.23313.13</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
4848
</PropertyGroup>
4949
<PropertyGroup>
5050
<!-- Dependency from https://github.com/dotnet/wpf -->
51-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.6.23307.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
51+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.6.23314.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
5252
</PropertyGroup>
5353
<PropertyGroup>
5454
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -68,50 +68,50 @@
6868
</PropertyGroup>
6969
<PropertyGroup>
7070
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
71-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23307.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
72-
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.6.23307.4</MicrosoftAspNetCoreAppRefPackageVersion>
73-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.6.23307.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
74-
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23307.4</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
75-
<dotnetdevcertsPackageVersion>8.0.0-preview.6.23307.4</dotnetdevcertsPackageVersion>
76-
<dotnetuserjwtsPackageVersion>8.0.0-preview.6.23307.4</dotnetuserjwtsPackageVersion>
77-
<dotnetusersecretsPackageVersion>8.0.0-preview.6.23307.4</dotnetusersecretsPackageVersion>
71+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23313.26</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
72+
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.6.23313.26</MicrosoftAspNetCoreAppRefPackageVersion>
73+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.6.23313.26</MicrosoftAspNetCoreAppRefInternalPackageVersion>
74+
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23313.26</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
75+
<dotnetdevcertsPackageVersion>8.0.0-preview.6.23313.26</dotnetdevcertsPackageVersion>
76+
<dotnetuserjwtsPackageVersion>8.0.0-preview.6.23313.26</dotnetuserjwtsPackageVersion>
77+
<dotnetusersecretsPackageVersion>8.0.0-preview.6.23313.26</dotnetusersecretsPackageVersion>
7878
</PropertyGroup>
7979
<PropertyGroup>
8080
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
8181
</PropertyGroup>
8282
<PropertyGroup>
8383
<!-- Dependencies from https://github.com/dotnet/sdk -->
84-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.6.23307.24</MicrosoftDotNetCommonItemTemplatesPackageVersion>
85-
<MicrosoftNETSdkPackageVersion>8.0.100-preview.6.23307.24</MicrosoftNETSdkPackageVersion>
86-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.6.23307.24</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
84+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.6.23315.14</MicrosoftDotNetCommonItemTemplatesPackageVersion>
85+
<MicrosoftNETSdkPackageVersion>8.0.100-preview.6.23315.14</MicrosoftNETSdkPackageVersion>
86+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.6.23315.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
8787
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
8888
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
8989
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
9090
</PropertyGroup>
9191
<PropertyGroup>
9292
<!-- Dependencies from https://github.com/dotnet/roslyn -->
93-
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23306.1</MicrosoftNetCompilersToolsetPackageVersion>
93+
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23315.1</MicrosoftNetCompilersToolsetPackageVersion>
9494
</PropertyGroup>
9595
<PropertyGroup>
9696
<!-- Dependencies from https://github.com/dotnet/corefx -->
97-
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.6.23307.4</MicrosoftNETCorePlatformsPackageVersion>
97+
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.6.23314.14</MicrosoftNETCorePlatformsPackageVersion>
9898
</PropertyGroup>
9999
<PropertyGroup>
100100
<!-- Dependencies from https://github.com/dotnet/core-setup -->
101-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23307.4</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
102-
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.6.23307.4</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
103-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23307.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
104-
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.6.23307.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
105-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23307.4</MicrosoftNETCoreAppRefPackageVersion>
106-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.6.23307.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
101+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23314.14</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
102+
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.6.23314.14</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
103+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23314.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
104+
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.6.23314.14</MicrosoftNETCoreAppHostwinx64PackageVersion>
105+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23314.14</MicrosoftNETCoreAppRefPackageVersion>
106+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.6.23314.14</MicrosoftNETCoreDotNetHostResolverPackageVersion>
107107
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
108108
</PropertyGroup>
109109
<PropertyGroup>
110110
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
111-
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23307.1</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
112-
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.6.23307.1</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
113-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.6.23307.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
114-
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.6.23307.1</MicrosoftWindowsDesktopAppRefPackageVersion>
111+
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23314.9</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
112+
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.6.23314.9</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
113+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.6.23314.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
114+
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.6.23314.9</MicrosoftWindowsDesktopAppRefPackageVersion>
115115
</PropertyGroup>
116116
<PropertyGroup>
117117
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
@@ -123,7 +123,7 @@
123123
</PropertyGroup>
124124
<PropertyGroup>
125125
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
126-
<NuGetBuildTasksPackageVersion>6.7.0-preview.3.57</NuGetBuildTasksPackageVersion>
126+
<NuGetBuildTasksPackageVersion>6.7.0-preview.3.77</NuGetBuildTasksPackageVersion>
127127
</PropertyGroup>
128128
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
129129
<PropertyGroup>
@@ -225,7 +225,7 @@
225225
<PropertyGroup>
226226
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
227227
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
228-
<MicrosoftNETTestSdkVersion>17.7.0-preview.23307.1</MicrosoftNETTestSdkVersion>
228+
<MicrosoftNETTestSdkVersion>17.7.0-preview-23313-04</MicrosoftNETTestSdkVersion>
229229
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
230230
</PropertyGroup>
231231
<!-- Workload manifest package versions -->
@@ -238,7 +238,7 @@
238238
<XamarinMacOSWorkloadManifestVersion>13.1.462-net8-p3</XamarinMacOSWorkloadManifestVersion>
239239
<XamarinTvOSWorkloadManifestVersion>16.1.1250-net8-p3</XamarinTvOSWorkloadManifestVersion>
240240
<!-- Workloads from dotnet/emsdk -->
241-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-preview.6.23301.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
241+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-preview.6.23312.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
242242
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
243243
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
244244
<EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>

‎src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,16 @@ private static IEnumerable<TestScenario> GetScenarios()
2929
foreach (DotNetLanguage language in new[] { DotNetLanguage.CSharp, DotNetLanguage.FSharp })
3030
{
3131
yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Web, DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex);
32-
yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true };
32+
// TODO: Re-enable once https://github.com/dotnet/runtime/pull/87518 flows to the public feeds. Note, the smoke-tests pull Microsoft.Extensions.DependencyModel
33+
// from a public feed - not a source build feed.
34+
//yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true };
3335
yield return new(nameof(WebScenarioTests), language, DotNetTemplate.WebApi, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);
3436
}
3537

38+
// TODO: Remove once https://github.com/dotnet/runtime/pull/87518 flows to the public feeds. Note, the smoke-tests pull Microsoft.Extensions.DependencyModel
39+
// from a public feed - not a source build feed.
40+
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true };
41+
3642
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Razor, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);
3743
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);
3844
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorServer, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);

‎src/SourceBuild/patches/nuget-client/0001-Target-net8.0-for-source-build.patch‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎src/SourceBuild/patches/nuget-client/0002-Add-dependencies-for-PVP-flow.patch‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)