Skip to content

Commit dce7a3a

Browse files
authored
Merge pull request #6723 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2
2 parents 3e5b37f + 959445b commit dce7a3a

File tree

472 files changed

+613
-488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

472 files changed

+613
-488
lines changed

build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<ItemGroup>
1010
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
1111
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
12-
<RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
1312
<RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
1413
</ItemGroup>
1514
</Project>

build/dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130

131131
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
132132
<DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-preview1-03124-01</DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion>
133-
<DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>2.0.0</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
133+
<DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
134134
<DevDependency_WindowsAzureStoragePackageVersion>8.7.0</DevDependency_WindowsAzureStoragePackageVersion>
135135
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
136136
<IdentityServer4AspNetIdentityPackageVersion>2.3.0</IdentityServer4AspNetIdentityPackageVersion>

build/submodules.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,5 @@
3939
<Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
4040
<Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
4141
<Repository Include="EntityFrameworkCore" />
42-
43-
<!-- Test-only repos -->
44-
<Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
4542
</ItemGroup>
4643
</Project>

src/AuthSamples/.gitignore

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

src/AuthSamples/AuthSamples.sln

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

src/AuthSamples/Directory.Build.props

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

src/AuthSamples/Directory.Build.targets

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

src/AuthSamples/NuGetPackageVerifier.json

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

src/AuthSamples/README.md

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

0 commit comments

Comments
 (0)