[main] Update dependencies from dotnet/sdk (#16240)
This commit is contained in:
v-wuzhai
GitHub
commit
98493e2d2a
7 changed files with 86 additions and 205 deletions
|
|
@ -7,7 +7,6 @@
|
|||
<clear />
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<add key="darc-pub-DotNet-msbuild-Trusted-8ffc3fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8ffc3fe3/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
|
|
@ -23,6 +22,7 @@
|
|||
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
|
||||
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
|
||||
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
|
||||
<add key="msbuild-prerelease-with-release-version" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8ffc3fe3/nuget/v3/index.json" />
|
||||
</packageSources>
|
||||
<disabledPackageSources>
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
|
|
|
|||
|
|
@ -1,46 +1,46 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.4.23225.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.5.23225.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>4f3bf487173e7610f5643e403b8f8d1d5a50db8f</Sha>
|
||||
<Sha>0b53e2db6ad599d05f86d1cfd0d1148058f06c06</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.4.23225.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.5.23225.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>4f3bf487173e7610f5643e403b8f8d1d5a50db8f</Sha>
|
||||
<Sha>0b53e2db6ad599d05f86d1cfd0d1148058f06c06</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.4.23225.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.5.23225.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>4f3bf487173e7610f5643e403b8f8d1d5a50db8f</Sha>
|
||||
<Sha>0b53e2db6ad599d05f86d1cfd0d1148058f06c06</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.4.23225.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.5.23225.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>4f3bf487173e7610f5643e403b8f8d1d5a50db8f</Sha>
|
||||
<Sha>0b53e2db6ad599d05f86d1cfd0d1148058f06c06</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.4.23225.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>21001dc3d436114803c00b60ece148af6e955b80</Sha>
|
||||
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.4.23225.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>21001dc3d436114803c00b60ece148af6e955b80</Sha>
|
||||
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.4.23225.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>21001dc3d436114803c00b60ece148af6e955b80</Sha>
|
||||
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23225.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>21001dc3d436114803c00b60ece148af6e955b80</Sha>
|
||||
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.4.23225.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>21001dc3d436114803c00b60ece148af6e955b80</Sha>
|
||||
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.4.23225.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>21001dc3d436114803c00b60ece148af6e955b80</Sha>
|
||||
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -48,38 +48,38 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.4.23225.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>21001dc3d436114803c00b60ece148af6e955b80</Sha>
|
||||
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.4.23225.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.5.23226.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5868d219346a29b8d89dcd5718642715478bed55</Sha>
|
||||
<Sha>015ceab6aeec700fbfb71cdfe9ff8fb51831d555</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.4.23225.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.5.23226.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5868d219346a29b8d89dcd5718642715478bed55</Sha>
|
||||
<Sha>015ceab6aeec700fbfb71cdfe9ff8fb51831d555</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23225.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.5.23226.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5868d219346a29b8d89dcd5718642715478bed55</Sha>
|
||||
<Sha>015ceab6aeec700fbfb71cdfe9ff8fb51831d555</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.4.23225.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.5.23226.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5868d219346a29b8d89dcd5718642715478bed55</Sha>
|
||||
<Sha>015ceab6aeec700fbfb71cdfe9ff8fb51831d555</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.4.23225.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.5.23226.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5868d219346a29b8d89dcd5718642715478bed55</Sha>
|
||||
<Sha>015ceab6aeec700fbfb71cdfe9ff8fb51831d555</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.4.23225.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.5.23226.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5868d219346a29b8d89dcd5718642715478bed55</Sha>
|
||||
<Sha>015ceab6aeec700fbfb71cdfe9ff8fb51831d555</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.4.23225.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.5.23226.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>5868d219346a29b8d89dcd5718642715478bed55</Sha>
|
||||
<Sha>015ceab6aeec700fbfb71cdfe9ff8fb51831d555</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -102,58 +102,58 @@
|
|||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>45a41b353d078e4d1e5918246fddbacb452eb210</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.4.23225.22">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.5.23226.11">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>988c3c8b4a646a435844f13526cfe7673bbaceee</Sha>
|
||||
<Sha>4f4ce7a7a9e7496d3c00472661af18c818139e96</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23225.22">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.5.23226.11">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>988c3c8b4a646a435844f13526cfe7673bbaceee</Sha>
|
||||
<Sha>4f4ce7a7a9e7496d3c00472661af18c818139e96</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23225.22">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.5.23226.11">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>988c3c8b4a646a435844f13526cfe7673bbaceee</Sha>
|
||||
<Sha>4f4ce7a7a9e7496d3c00472661af18c818139e96</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23225.22">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.5.23226.11">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>988c3c8b4a646a435844f13526cfe7673bbaceee</Sha>
|
||||
<Sha>4f4ce7a7a9e7496d3c00472661af18c818139e96</Sha>
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.4.23223.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.4.23224.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>2702e433748f2280a4c1c763a7e007f3b207be64</Sha>
|
||||
<Sha>12830648052756e3ca3ddd9c637058915143cfb5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-preview.5.23224.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-preview.5.23225.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>9f9f14716f7b7056534b87e589de9fd2247b0d0f</Sha>
|
||||
<Sha>b2dbf9872367d2ef41f406b4786df0b02b75445d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23221.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23225.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>858e2df9631a385cbddef62eeb424f9b3071b031</Sha>
|
||||
<Sha>1bbbdb332e8142776ae722f8933464249001ced6</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.400-beta.23221.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.400-beta.23225.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>858e2df9631a385cbddef62eeb424f9b3071b031</Sha>
|
||||
<Sha>1bbbdb332e8142776ae722f8933464249001ced6</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23219.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23225.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>10eebba738292e0154358aeb5cc7e108dbe2067f</Sha>
|
||||
<Sha>8e6424700be04bf5e9b9e0146407aa2470b86518</Sha>
|
||||
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.4.23225.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.4.23225.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>21001dc3d436114803c00b60ece148af6e955b80</Sha>
|
||||
<Sha>9a7db5556f4ad892c611b2e174594db17fdec3af</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-1.23225.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-1.23225.10" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>663ceb3ec6e46c25d1128f58ec29288c52fa7e1a</Sha>
|
||||
<Sha>2c5b998a222919a836957d02846c6cc39f418bcd</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23225-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23226-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>6300d22b25cc1bcb634663bd7087e31d8312bb15</Sha>
|
||||
<Sha>83ce3529b2ab96cf987a856befdea1e93d2ad9fc</Sha>
|
||||
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.1.20" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
|
|||
|
|
@ -41,11 +41,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.4.23223.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.4.23224.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.5.23224.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.5.23225.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -65,50 +65,50 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23225.3</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.4.23225.3</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.4.23225.3</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23225.3</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>8.0.0-preview.4.23225.3</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>8.0.0-preview.4.23225.3</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>8.0.0-preview.4.23225.3</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.5.23226.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.5.23226.1</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.5.23226.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.5.23226.1</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>8.0.0-preview.5.23226.1</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>8.0.0-preview.5.23226.1</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>8.0.0-preview.5.23226.1</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23225.22</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23225.22</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23225.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.5.23226.11</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.100-preview.5.23226.11</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.5.23226.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-1.23225.7</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-1.23225.10</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.4.23225.9</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23225.9</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.4.23225.9</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23225.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.4.23225.9</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.4.23225.9</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.4.23225.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23225.14</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.4.23225.14</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.4.23225.14</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23225.1</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.4.23225.1</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.4.23225.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.4.23225.1</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.5.23225.4</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.5.23225.4</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.5.23225.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.5.23225.4</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
@ -218,7 +218,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.7.0-preview.23219.2</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.7.0-preview.23225.6</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
From: Larry Ewing <lewing@microsoft.com>
|
||||
|
||||
Backport: https://github.com/dotnet/aspnetcore/pull/47879.
|
||||
|
||||
diff --git a/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs b/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs
|
||||
index b85d798418..5fda9ca1b3 100644
|
||||
--- a/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs
|
||||
+++ b/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs
|
||||
@@ -76,7 +76,9 @@ public class BlobLoggerProvider : BatchingLoggerProvider
|
||||
writer.Write(logEvent.Message);
|
||||
}
|
||||
|
||||
+#pragma warning disable CA2016
|
||||
await writer.FlushAsync().ConfigureAwait(false);
|
||||
+#pragma warning restore CA2016
|
||||
var tryGetBuffer = stream.TryGetBuffer(out var buffer);
|
||||
System.Diagnostics.Debug.Assert(tryGetBuffer);
|
||||
await blob.AppendAsync(buffer, cancellationToken).ConfigureAwait(false);
|
||||
diff --git a/src/Middleware/HttpLogging/src/FileLoggerProcessor.cs b/src/Middleware/HttpLogging/src/FileLoggerProcessor.cs
|
||||
index 3f9a317fd5..d99d175f83 100644
|
||||
--- a/src/Middleware/HttpLogging/src/FileLoggerProcessor.cs
|
||||
+++ b/src/Middleware/HttpLogging/src/FileLoggerProcessor.cs
|
||||
@@ -264,7 +264,7 @@ internal partial class FileLoggerProcessor : IAsyncDisposable
|
||||
return;
|
||||
}
|
||||
await streamWriter.WriteLineAsync(message.AsMemory(), cancellationToken);
|
||||
- await streamWriter.FlushAsync();
|
||||
+ await streamWriter.FlushAsync(cancellationToken);
|
||||
}
|
||||
|
||||
// Virtual for testing
|
||||
diff --git a/src/Mvc/Mvc.Razor/src/RazorPageBase.cs b/src/Mvc/Mvc.Razor/src/RazorPageBase.cs
|
||||
index 07a187d48f..229896cc39 100644
|
||||
--- a/src/Mvc/Mvc.Razor/src/RazorPageBase.cs
|
||||
+++ b/src/Mvc/Mvc.Razor/src/RazorPageBase.cs
|
||||
@@ -634,7 +634,7 @@ public abstract class RazorPageBase : IRazorPage
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
- /// Invokes <see cref="TextWriter.FlushAsync"/> on <see cref="Output"/> and <see cref="m:Stream.FlushAsync"/>
|
||||
+ /// Invokes <see cref="TextWriter.FlushAsync()"/> on <see cref="Output"/> and <see cref="m:Stream.FlushAsync"/>
|
||||
/// on the response stream, writing out any buffered content to the <see cref="HttpResponse.Body"/>.
|
||||
/// </summary>
|
||||
/// <returns>A <see cref="Task{HtmlString}"/> that represents the asynchronous flush operation and on
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Deseyn <tom.deseyn@gmail.com>
|
||||
Date: Tue, 25 Apr 2023 21:33:21 +0200
|
||||
Subject: [PATCH] Directory.Build.props: don't overwrite PackageOS from
|
||||
source-build.
|
||||
|
||||
Backport: https://github.com/dotnet/runtime/pull/85350
|
||||
---
|
||||
Directory.Build.props | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Directory.Build.props b/Directory.Build.props
|
||||
index e238fe3f9bc..ad38d4cae3a 100644
|
||||
--- a/Directory.Build.props
|
||||
+++ b/Directory.Build.props
|
||||
@@ -207,7 +207,7 @@
|
||||
|
||||
<!-- source-build sets PackageOS to build with non-portable rid packages that were source-built previously. -->
|
||||
<PackageRID Condition="'$(PackageOS)' != ''">$(PackageOS)-$(TargetArchitecture)</PackageRID>
|
||||
- <PackageRID>$(_packageOS)-$(TargetArchitecture)</PackageRID>
|
||||
+ <PackageRID Condition="'$(PackageRID)' == ''">$(_packageOS)-$(TargetArchitecture)</PackageRID>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- ToolsRID is used for packages needed on the build host. -->
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Mitchell <mmitche@microsoft.com>
|
||||
Date: Wed, 19 Apr 2023 09:30:15 -0700
|
||||
Subject: [PATCH] Remove explicit framework ref assembly ref The SDK brings
|
||||
this implicitly when targeting a net4* TFM
|
||||
|
||||
Backport: https://github.com/microsoft/vstest/pull/4407
|
||||
---
|
||||
Directory.Build.targets | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/Directory.Build.targets b/Directory.Build.targets
|
||||
index 5077c4638..b720568ba 100644
|
||||
--- a/Directory.Build.targets
|
||||
+++ b/Directory.Build.targets
|
||||
@@ -11,11 +11,6 @@
|
||||
<TargetFramework Condition=" '$(TargetFramework)' != '' ">$(NetCurrent)</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
- <!-- Allows build of .NET Framework assemblies on MacOS and Linux https://github.com/dotnet/designs/pull/33#issuecomment-489264196 -->
|
||||
- <ItemGroup>
|
||||
- <PackageReference Condition=" '$(OS)' != 'Windows_NT' " Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
|
||||
- </ItemGroup>
|
||||
-
|
||||
<!-- Test project settings -->
|
||||
<Choose>
|
||||
<When Condition="$(TestProject) == 'true'">
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Mon, 24 Apr 2023 13:46:10 +0000
|
||||
Subject: [PATCH] Addressing System.Private.Uri source-build prebuilt in
|
||||
testhost
|
||||
|
||||
Backport: https://github.com/microsoft/vstest/pull/4414
|
||||
---
|
||||
src/testhost.arm64/testhost.arm64.csproj | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/testhost.arm64/testhost.arm64.csproj b/src/testhost.arm64/testhost.arm64.csproj
|
||||
index 606f41c88..f062eae78 100644
|
||||
--- a/src/testhost.arm64/testhost.arm64.csproj
|
||||
+++ b/src/testhost.arm64/testhost.arm64.csproj
|
||||
@@ -37,7 +37,7 @@
|
||||
</ProjectReference>
|
||||
|
||||
<!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
|
||||
- <PackageReference Include="System.Private.Uri" Version="$(SystemUriVersion)" />
|
||||
+ <PackageReference Include="System.Private.Uri" Version="$(SystemUriVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
|
||||
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.4" Condition=" $(TargetFramework.StartsWith('net4')) " />
|
||||
<!-- CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981 mitigation -->
|
||||
</ItemGroup>
|
||||
Loading…
Add table
Reference in a new issue