Skip to content

Commit 5614a45

Browse files
authored
Merge pull request #4274 from dotnet/wtgodbe/31MergeInternal
[release/3.1] Merge internal commits
2 parents 007b40d + ad7513e commit 5614a45

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

NuGet.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
<packageSources>
55
<clear />
66
<add key="myget-legacy" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
7-
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
87
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
98
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
109
<add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
11-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
10+
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1211
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1312
<add key="dotnet-wd" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
1413
</packageSources>

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.1-servicing.21064.4">
5-
<Uri>https://github.com/dotnet/winforms</Uri>
6-
<Sha>77b8f5e591e4e29951113504738ee1298d180367</Sha>
4+
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.1-servicing.21111.5">
5+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6+
<Sha>14b57cf8257c5b70f904d7cd39038eb024656ae6</Sha>
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919
<!-- NuGet Package Versions -->
2020
<PropertyGroup>
21-
<MicrosoftPrivateWinformsVersion>4.8.1-servicing.21064.4</MicrosoftPrivateWinformsVersion>
21+
<MicrosoftPrivateWinformsVersion>4.8.1-servicing.21111.5</MicrosoftPrivateWinformsVersion>
2222
</PropertyGroup>
2323
<!-- Packages that come from https://github.com/dotnet/coreclr -->
2424
<PropertyGroup>

0 commit comments

Comments
 (0)