Skip to content

Commit 7785570

Browse files
Remove Microsoft.DotNet.Wpf.DncEng ingestion (#477)
* Add triggers for experimental/* * Remove [dotnet-wpf-int]Microsoft.DotNet.Wpf.DncEng dependency and redirect it to [dotnet/wpf]Microsoft.DotNet.Wpf.GitHub * Update dependencies from https://github.com/dotnet/wpf (https://dev.azure.com/dnceng/internal/_git/dotnet-wpf)
1 parent f0519e0 commit 7785570

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ trigger:
33
branches:
44
include:
55
- master
6+
- experimental/*
67

78
pr:
89
- master
10+
- experimental/*
911

1012
name: $(Date:yyyyMMdd)$(Rev:.r)
1113

eng/Version.Details.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,13 @@
117117
<Uri>https://github.com/dotnet/coreclr</Uri>
118118
<Sha>a9f3fc16483eecfc47fb79c362811d870be02249</Sha>
119119
</Dependency>
120-
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.0-preview.1.20110.4" CoherentParentDependency="Microsoft.DotNet.Wpf.DncEng">
120+
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.0-preview.1.20108.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
121121
<Uri>https://github.com/dotnet/winforms</Uri>
122122
<Sha>8818624e86a7aa64dbcd06fe78e406fa8caf008a</Sha>
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="5.0.0-preview.1.20110.16" CoherentParentDependency="Microsoft.DotNet.Wpf.DncEng">
124+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="5.0.0-preview.1.20111.9">
125125
<Uri>https://github.com/dotnet/wpf</Uri>
126-
<Sha>4032e7e163d8d1b3b3f446688d2d11edd864c33f</Sha>
127-
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.0-preview.1.20111.7">
129-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
130-
<Sha>3820ef430e9ced4cd027786b073271770946254c</Sha>
126+
<Sha>50d2d8b79705def3c236021e93c510ad00d5a900</Sha>
131127
</Dependency>
132128
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha1.19514.1" CoherentParentDependency="Microsoft.Private.Winforms">
133129
<Uri>https://github.com/dotnet/core-setup</Uri>

eng/Versions.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@
8484
<!-- winforms -->
8585
<MicrosoftPrivateWinformsVersion>5.0.0-preview.1.20110.4</MicrosoftPrivateWinformsVersion>
8686
<!-- wpf -->
87-
<MicrosoftDotNetWpfGitHubVersion>5.0.0-preview.1.20110.16</MicrosoftDotNetWpfGitHubVersion>
88-
<!-- wpf-int -->
89-
<MicrosoftDotNetWpfDncEngVersion>5.0.0-preview.1.20111.7</MicrosoftDotNetWpfDncEngVersion>
87+
<MicrosoftDotNetWpfGitHubVersion>5.0.0-preview.1.20111.9</MicrosoftDotNetWpfGitHubVersion>
9088
<!-- Not auto-updated. -->
9189
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
9290
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

pkg/windowsdesktop/src/windowsdesktop.depproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.DotNet.Wpf.DncEng" Version="$(MicrosoftDotNetWpfDncEngVersion)" />
54
<PackageReference Include="Microsoft.DotNet.Wpf.GitHub" Version="$(MicrosoftDotNetWpfGitHubVersion)" />
65
<PackageReference Include="Microsoft.Private.Winforms" Version="$(MicrosoftPrivateWinformsVersion)" />
76

0 commit comments

Comments
 (0)