Skip to content

Commit 23a043f

Browse files
nkolev92nkolev92
authored
Stop using consumption feed (#7486)
1 parent 06a3d31 commit 23a043f

2 files changed

Lines changed: 39 additions & 27 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<PackageVersion Include="Microsoft.PowerShell.3.ReferenceAssemblies" Version="1.0.0" />
6161
<!-- Microsoft.TeamFoundationServer.ExtendedClient has vulnerable dependencies Microsoft.IdentityModel.JsonWebTokens and System.IdentityModel.Tokens.Jwt . When it's upgraded, try removing the pinned packages -->
6262
<PackageVersion Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="16.153.0" />
63-
<PackageVersion Include="Microsoft.Test.Apex.VisualStudio" Version="18.0.0-preview-1-10723-180" />
63+
<PackageVersion Include="Microsoft.Test.Apex.VisualStudio" Version="18.0.0-preview-1-10827-020" />
6464
<PackageVersion Include="Microsoft.TestPlatform.Portable" Version="17.1.0" />
6565
<PackageVersion Include="Microsoft.VisualStudio.ComponentModelHost" Version="18.8.850" />
6666
<PackageVersion Include="Microsoft.VisualStudio.Copilot" Version="18.0.848-alpha" />
@@ -99,7 +99,7 @@
9999
<PackageVersion Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
100100
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
101101
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
102-
<PackageVersion Include="VsWebSite.Interop" Version="17.10.40173" />
102+
<PackageVersion Include="VsWebSite.Interop" Version="17.10.40459" />
103103
<PackageVersion Include="xunit" Version="2.9.0" />
104104
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
105105
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />

‎NuGet.Config‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
77
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
88
<add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
9-
<add key="vside" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/msft_consumption%40Local/nuget/v3/index.json" />
9+
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
10+
<add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
11+
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
12+
<add key="vs-impl-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl-archived/nuget/v3/index.json" />
1013
</packageSources>
1114
<auditSources>
1215
<clear />
@@ -38,6 +41,7 @@
3841
<package pattern="Microsoft.*" />
3942
<package pattern="Microsoft.Build.Framework" />
4043
<package pattern="Microsoft.NET.StringTools" />
44+
<package pattern="Microsoft.VisualStudioEng.MicroBuild.Core" />
4145
<package pattern="Microsoft.VisualStudio.TemplateWizardInterface" />
4246
<package pattern="moq" />
4347
<package pattern="MSTest.TestAdapter" />
@@ -59,6 +63,17 @@
5963
<package pattern="xunit.*" />
6064
<package pattern="xunitxml.testlogger" />
6165
<package pattern="Microsoft.DotNet.PlatformAbstractions" />
66+
<package pattern="Microsoft.VisualStudio.SDK.EmbedInteropTypes" />
67+
<package pattern="Microsoft.DataAI.NuGetRecommender.Contracts" />
68+
<package pattern="Microsoft.TeamFoundationServer.ExtendedClient" />
69+
<package pattern="Microsoft.VisualStudio.TaskRunnerExplorer.14.0" />
70+
<package pattern="Microsoft.VisualStudio.Web.BrowserLink.12.0" />
71+
<package pattern="Microsoft.VisualStudio.LanguageServices" />
72+
<package pattern="Microsoft.VisualStudio.Services.Client" />
73+
<package pattern="Microsoft.VisualStudio.Services.InteractiveClient" />
74+
<package pattern="Microsoft.VsSDK.CompatibilityAnalyzer" /> <!-- This is odd one. This version exists on nuget.org, but not in the vssdk feed. It is very likely we need to change this one at some point. Microsoft.VSSDK.BuildTools Microsoft.VSSDK.BuildTools 17.4.2116 needs to be updated -->
75+
<package pattern="Microsoft.VisualStudio.Sdk.TestFramework.Xunit" />
76+
<package pattern="Microsoft.VisualStudio.Sdk.TestFramework" />
6277
</packageSource>
6378
<packageSource key="dotnet-eng">
6479
<package pattern="Microsoft.DotNet.*" />
@@ -67,39 +82,36 @@
6782
<package pattern="nuget.client.endtoend.testdata" />
6883
<package pattern="nugetvalidator" />
6984
</packageSource>
70-
<packageSource key="vside">
71-
<package pattern="envdte" />
72-
<package pattern="envdte100" />
73-
<package pattern="envdte80" />
74-
<package pattern="envdte90" />
75-
<package pattern="envdte90a" />
85+
<packageSource key="vs-impl">
86+
<package pattern="Microsoft.Internal.VisualStudio.*" />
87+
<package pattern="microsoft.servicehub.*" />
88+
<package pattern="microsoft.test.apex.visualstudio" />
89+
<package pattern="Microsoft.VisualStudio.*" />
90+
<package pattern="Microsoft.VSSDK.*" />
91+
</packageSource>
92+
<packageSource key="vssdk">
93+
<package pattern="envdte*" />
7694
<package pattern="Microsoft.Build.Framework" />
77-
<package pattern="Microsoft.DataAI.NuGetRecommender.Contracts" />
78-
<package pattern="microsoft.internal.visualstudio.*" />
79-
<package pattern="Microsoft.Internal.VisualStudio.Shell.Framework" />
95+
<package pattern="Microsoft.Internal.VisualStudio.*" />
8096
<package pattern="Microsoft.NET.StringTools" />
8197
<package pattern="microsoft.servicehub.*" />
82-
<package pattern="Microsoft.ServiceHub.Framework" />
83-
<package pattern="Microsoft.TeamFoundationServer.ExtendedClient" />
84-
<package pattern="microsoft.test.apex.visualstudio" />
8598
<package pattern="Microsoft.VisualStudio.*" />
86-
<package pattern="Microsoft.VisualStudioEng.MicroBuild.Core" />
8799
<package pattern="Microsoft.VSSDK.*" />
88100
<package pattern="stdole" />
89101
<package pattern="streamjsonrpc" />
90-
<package pattern="vslangproj" />
91-
<package pattern="vslangproj100" />
92-
<package pattern="vslangproj110" />
93-
<package pattern="vslangproj140" />
94-
<package pattern="vslangproj150" />
95-
<package pattern="vslangproj157" />
96-
<package pattern="vslangproj158" />
97-
<package pattern="vslangproj165" />
98-
<package pattern="vslangproj2" />
99-
<package pattern="vslangproj80" />
100-
<package pattern="vslangproj90" />
102+
<package pattern="vslangproj*" />
101103
<package pattern="vswebsite.interop" />
102104
</packageSource>
105+
<packageSource key="vssdk-archived">
106+
<package pattern="Microsoft.VisualStudio.*" />
107+
<package pattern="Microsoft.VSSDK.*" />
108+
<package pattern="Microsoft.Internal.VisualStudio.*" />
109+
</packageSource>
110+
<packageSource key="vs-impl-archived">
111+
<package pattern="Microsoft.VisualStudio.*" />
112+
<package pattern="Microsoft.VSSDK.*" />
113+
<package pattern="Microsoft.Internal.VisualStudio.*" />
114+
</packageSource>
103115
<packageSource key="VS">
104116
<package pattern="Microsoft.DevDiv.Validation.TestPlatform.Settings.Tasks" />
105117
</packageSource>

0 commit comments

Comments
 (0)