Skip to content

[automated] Merge branch 'release/2.1' => 'release/2.2' #6723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 16, 2019
Merged

[automated] Merge branch 'release/2.1' => 'release/2.2' #6723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e751db0
Make Auth Samples Project Ref (#6557)
jkotalik Jan 15, 2019
fe20f92
Fix #3503 - update buildtools dependency on DependencyModel to 2.1.0
Jan 11, 2019
eacffd5
Merge branch 'release/2.1' into release/2.2
jkotalik Jan 16, 2019
4a2a894
Cleanup
jkotalik Jan 16, 2019
959445b
Target netcoreapp2.2
jkotalik Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion build/buildorder.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<ItemGroup>
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
<RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
<RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@

<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
<DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-preview1-03124-01</DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion>
<DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>2.0.0</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
<DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
<DevDependency_WindowsAzureStoragePackageVersion>8.7.0</DevDependency_WindowsAzureStoragePackageVersion>
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
<IdentityServer4AspNetIdentityPackageVersion>2.3.0</IdentityServer4AspNetIdentityPackageVersion>
Expand Down
3 changes: 0 additions & 3 deletions build/submodules.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,5 @@
<Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
<Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
<Repository Include="EntityFrameworkCore" />

<!-- Test-only repos -->
<Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
</ItemGroup>
</Project>
38 changes: 0 additions & 38 deletions src/AuthSamples/.gitignore
View file
Open in desktop

This file was deleted.

146 changes: 0 additions & 146 deletions src/AuthSamples/AuthSamples.sln
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/AuthSamples/Directory.Build.props
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/AuthSamples/Directory.Build.targets
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/AuthSamples/NuGetPackageVerifier.json
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/AuthSamples/README.md
View file
Open in desktop

This file was deleted.

Loading