Skip to content

Commit

Permalink
MVP Rendering Restructure (#482)
Browse files Browse the repository at this point in the history
* MvpSite Restructure

+ Collapsed all projects into 1
+ Upgraded Centralized Packages
+ Full nullability sweep
+ File scoped namespaces
+ Fixed docker dotnet watch
+ Improved Development config exclusion
+ Fixed docker layoutservice connection

* Remove migration file

* Add NuGet.config to sln

* Updated GitHub Actions to match new repository structure

---------

Co-authored-by: Ivan Lieckens <[email protected]>
Co-authored-by: Rob Earlam <[email protected]>
  • Loading branch information
3 people authored Sep 30, 2024
1 parent ba5c505 commit 848e0e2
Show file tree
Hide file tree
Showing 427 changed files with 5,721 additions and 6,321 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI-CD_MVP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
if: github.repository_owner == 'Sitecore' && ((github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'push') || (github.event_name == 'workflow_dispatch'))
with:
buildConfiguration: Debug
projectLocation: headapps/MvpSite/Mvp.Project.MvpSite.Rendering
projectLocation: headapps/MvpSite/MvpSite.Rendering
assetName: Mvp-Staging
webAppName: Mvp-Staging
secrets:
Expand All @@ -42,7 +42,7 @@ jobs:
uses: ./.github/workflows/deploy_azureWebapp.yml
with:
buildConfiguration: Release
projectLocation: headapps/MvpSite/Mvp.Project.MvpSite.Rendering
projectLocation: headapps/MvpSite/MvpSite.Rendering
assetName: Mvp-prod
webAppName: Mvp-Production
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ packages/
xmcloud.plugin.pre-release.json

# developer configs
headapps/MvpSite/Mvp.Project.MvpSite.Rendering/appsettings.Development.json
appsettings.Development.json
8 changes: 0 additions & 8 deletions headapps/MvpSite/Directory.Build.targets

This file was deleted.

46 changes: 46 additions & 0 deletions headapps/MvpSite/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<!-- Further info https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
<PlatformVersion>1.*</PlatformVersion>
<AspNetCoreSdkVersion>0.0.7</AspNetCoreSdkVersion>
</PropertyGroup>

<ItemGroup Label="Platform Package References">
<PackageVersion Include="Sitecore.XmCloud.Kernel" Version="$(PlatformVersion)" />
<PackageVersion Include="Sitecore.XmCloud.ContentSearch" Version="$(PlatformVersion)" />
<PackageVersion Include="Sitecore.XmCloud.ContentSearch.Linq" Version="$(PlatformVersion)" />
<PackageVersion Include="Sitecore.XmCloud.LayoutService" Version="$(PlatformVersion)" />
<PackageVersion Include="Sitecore.XmCloud.Assemblies" Version="$(PlatformVersion)" />
</ItemGroup>

<ItemGroup Label="Rendering Host Package References">
<PackageVersion Include="Sitecore.AspNetCore.SDK.LayoutService.Client" Version="$(AspNetCoreSdkVersion)" />
<PackageVersion Include="Sitecore.AspNetCore.SDK.RenderingEngine" Version="$(AspNetCoreSdkVersion)" />
<PackageVersion Include="Sitecore.AspNetCore.SDK.ExperienceEditor" Version="$(AspNetCoreSdkVersion)" />

<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0"/>
<PackageVersion Include="System.ServiceModel.Syndication" Version="8.0.0" />

<PackageVersion Include="BuildWebCompiler" Version="1.12.405" />
<PackageVersion Include="GraphQL.Client" Version="4.0.2" />
<PackageVersion Include="GraphQL.Client.Serializer.Newtonsoft" Version="4.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Session" Version="2.2.0" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
<PackageVersion Include="Okta.AspNetCore" Version="4.5.0" />
<PackageVersion Include="Mvp.Selections.Client" Version="4.14.0" />
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageVersion Include="Markdig" Version="0.37.0" />
</ItemGroup>

<ItemGroup Label="Global Project Tooling">
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</GlobalPackageReference>
</ItemGroup>
</Project>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 848e0e2

Please sign in to comment.