Skip to content

Commit 822e4e6

Browse files
committed
Recreate development dependency migration on latest EF model (#7141)
Address #5666 Address #7140
1 parent 81cdee6 commit 822e4e6

6 files changed

Lines changed: 135 additions & 133 deletions

src/GalleryTools/Commands/BackfillCommand.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,10 @@ private static XDocument LoadDocument(Stream stream)
269269
IgnoreWhitespace = true,
270270
IgnoreComments = true,
271271
IgnoreProcessingInstructions = true,
272-
XmlResolver = null,
273272
};
273+
274+
// This is intentionally separate from the object initializer so that FXCop can see it.
275+
settings.XmlResolver = null;
274276

275277
using (var streamReader = new StreamReader(stream))
276278
using (var xmlReader = XmlReader.Create(streamReader, settings))

src/NuGetGallery/Migrations/201905020719236_DevelopmentDependencyMetadata.resx

Lines changed: 0 additions & 126 deletions
This file was deleted.

src/NuGetGallery/Migrations/201905020719236_DevelopmentDependencyMetadata.Designer.cs renamed to src/NuGetGallery/Migrations/201905071526573_DevelopmentDependencyMetadata.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/NuGetGallery/Migrations/201905020719236_DevelopmentDependencyMetadata.cs renamed to src/NuGetGallery/Migrations/201905071526573_DevelopmentDependencyMetadata.cs

File renamed without changes.

src/NuGetGallery/Migrations/201905071526573_DevelopmentDependencyMetadata.resx

Lines changed: 126 additions & 0 deletions
Large diffs are not rendered by default.

src/NuGetGallery/NuGetGallery.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@
246246
<Compile Include="Migrations\201904292139301_RemoveVulnerabilityDataFromPackageDeprecationModel.Designer.cs">
247247
<DependentUpon>201904292139301_RemoveVulnerabilityDataFromPackageDeprecationModel.cs</DependentUpon>
248248
</Compile>
249-
<Compile Include="Migrations\201905020719236_DevelopmentDependencyMetadata.cs" />
250-
<Compile Include="Migrations\201905020719236_DevelopmentDependencyMetadata.Designer.cs">
251-
<DependentUpon>201905020719236_DevelopmentDependencyMetadata.cs</DependentUpon>
249+
<Compile Include="Migrations\201905071526573_DevelopmentDependencyMetadata.cs" />
250+
<Compile Include="Migrations\201905071526573_DevelopmentDependencyMetadata.Designer.cs">
251+
<DependentUpon>201905071526573_DevelopmentDependencyMetadata.cs</DependentUpon>
252252
</Compile>
253253
<Compile Include="Services\IPackageDeprecationService.cs" />
254254
<Compile Include="Queries\AutocompleteDatabasePackageIdsQuery.cs" />
@@ -1727,8 +1727,8 @@
17271727
<EmbeddedResource Include="Migrations\201904292139301_RemoveVulnerabilityDataFromPackageDeprecationModel.resx">
17281728
<DependentUpon>201904292139301_RemoveVulnerabilityDataFromPackageDeprecationModel.cs</DependentUpon>
17291729
</EmbeddedResource>
1730-
<EmbeddedResource Include="Migrations\201905020719236_DevelopmentDependencyMetadata.resx">
1731-
<DependentUpon>201905020719236_DevelopmentDependencyMetadata.cs</DependentUpon>
1730+
<EmbeddedResource Include="Migrations\201905071526573_DevelopmentDependencyMetadata.resx">
1731+
<DependentUpon>201905071526573_DevelopmentDependencyMetadata.cs</DependentUpon>
17321732
</EmbeddedResource>
17331733
<EmbeddedResource Include="OData\QueryAllowed\Data\apiv1packages.json" />
17341734
<EmbeddedResource Include="OData\QueryAllowed\Data\apiv1search.json" />

0 commit comments

Comments
 (0)