提交 d974f4b1 编写于 作者: D DotNet Bot

[internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms

- Coherency Updates:
  - Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.ILDAsm: from 6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.ILAsm: from 6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.App.Ref: from 6.0.1 to 6.0.3 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.3 (parent: Microsoft.Private.Winforms)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent: Microsoft.Private.Winforms)
上级 ae9031af
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-10db735" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-10db7350/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" /> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
<disabledPackageSources> <disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-10db735" value="true" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources> </disabledPackageSources>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.3-servicing.22114.7"> <Dependency Name="Microsoft.Private.Winforms" Version="6.0.3-servicing.22115.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>553b0d1a8c7bf45cc27282ff8afbe20f697a6601</Sha> <Sha>ba13948446da002973d174e3d1c8843f844e6fe2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.3-servicing.22114.7"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.3-servicing.22115.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>553b0d1a8c7bf45cc27282ff8afbe20f697a6601</Sha> <Sha>ba13948446da002973d174e3d1c8843f844e6fe2</Sha>
</Dependency> </Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.1" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> <Sha>10db7350e1288caf09e684e1b219f8f5b08eca02</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.22104.2"> <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.22104.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
...@@ -57,29 +57,29 @@ ...@@ -57,29 +57,29 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.1-servicing.21567.5" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.3-servicing.22115.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> <Sha>10db7350e1288caf09e684e1b219f8f5b08eca02</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.1-servicing.21567.5" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.3-servicing.22115.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> <Sha>10db7350e1288caf09e684e1b219f8f5b08eca02</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="System.Resources.Extensions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.1" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> <Sha>10db7350e1288caf09e684e1b219f8f5b08eca02</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.1" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> <Sha>10db7350e1288caf09e684e1b219f8f5b08eca02</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.1-servicing.21567.5" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.3-servicing.22115.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> <Sha>10db7350e1288caf09e684e1b219f8f5b08eca02</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<MinorVersion>0</MinorVersion> <MinorVersion>0</MinorVersion>
<PatchVersion>3</PatchVersion> <PatchVersion>3</PatchVersion>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix> <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<!-- <!--
Set assembly version to align with major and minor version, as for the patches and revisions should be manually Set assembly version to align with major and minor version, as for the patches and revisions should be manually
updated per assembly if it is serviced. updated per assembly if it is serviced.
...@@ -19,7 +18,6 @@ ...@@ -19,7 +18,6 @@
those issues can be mitigated with a workaround described in https://github.com/dotnet/core/issues/7176. those issues can be mitigated with a workaround described in https://github.com/dotnet/core/issues/7176.
--> -->
<AssemblyVersion>$(MajorVersion).$(MinorVersion).2.0</AssemblyVersion> <AssemblyVersion>$(MajorVersion).$(MinorVersion).2.0</AssemblyVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel> <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration> <PreReleaseVersionIteration>
</PreReleaseVersionIteration> </PreReleaseVersionIteration>
...@@ -28,20 +26,20 @@ ...@@ -28,20 +26,20 @@
</PropertyGroup> </PropertyGroup>
<!-- NuGet Package Versions --> <!-- NuGet Package Versions -->
<PropertyGroup> <PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.3-servicing.22114.7</MicrosoftPrivateWinformsVersion> <MicrosoftPrivateWinformsVersion>6.0.3-servicing.22115.6</MicrosoftPrivateWinformsVersion>
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr --> <!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup> <PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion> <MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.1-servicing.21567.5</MicrosoftNETCoreILDAsmVersion> <MicrosoftNETCoreILDAsmVersion>6.0.3-servicing.22115.5</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.1-servicing.21567.5</MicrosoftNETCoreILAsmVersion> <MicrosoftNETCoreILAsmVersion>6.0.3-servicing.22115.5</MicrosoftNETCoreILAsmVersion>
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup --> <!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup> <PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.1-servicing.21567.5</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.3-servicing.22115.5</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.1</MicrosoftNETCoreAppRefVersion> <MicrosoftNETCoreAppRefVersion>6.0.3</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.1</MicrosoftNETCoreAppRuntimewinx64Version> <MicrosoftNETCoreAppRuntimewinx64Version>6.0.3</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.1</MicrosoftNETCorePlatformsVersion> <MicrosoftNETCorePlatformsVersion>6.0.2</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion> <SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0</SystemDirectoryServicesVersion> <SystemDirectoryServicesVersion>6.0.0</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0</SystemReflectionMetadataLoadContextVersion> <SystemReflectionMetadataLoadContextVersion>6.0.0</SystemReflectionMetadataLoadContextVersion>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册