diff --git a/.github/New BackOffice - README.md b/.github/New BackOffice - README.md index 3d04ef2e36..c67ebdea93 100644 --- a/.github/New BackOffice - README.md +++ b/.github/New BackOffice - README.md @@ -1,13 +1,13 @@ -# New Backoffice +# New backoffice > **Warning**: -> This is an early WIP, and is set not to be packable since we don't want to release this yet. There will be breaking changes in these projects +> This is an early WIP and is set not to be packable since we don't want to release this yet. There will be breaking changes in these projects. -This solution folder contains the projects for the new BackOffice. If you're looking to fix or improve the existing CMS, this is not the place to do it, although we do very much appreciate your efforts. +This solution folder contains the projects for the new backoffice. If you're looking to fix or improve the existing CMS, this is not the place to do it, although we do very much appreciate your efforts. ### Project structure -Since the new backoffice API is still very much a work in progress we've created new projects for the new backoffice API: +Since the new backoffice API is still very much a work in progress, we've created new projects for the new backoffice API: * Umbrao.Cms.ManagementApi - The "presentation layer" for the management API * "New" versions of existing projects, should be merged with the existing projects when the new API is released: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 216352689e..5c09dfe2c5 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,14 +2,28 @@ name: "Code scanning - action" on: push: - branches: ["*/dev", "*/contrib"] + branches: + - '*/dev' + - '*/contrib' pull_request: # The branches below must be a subset of the branches above - branches: ["*/dev", "*/contrib"] + branches: + - '*/dev' + - '*/contrib' permissions: contents: read +env: + dotnetVersion: 6.x + dotnetIncludePreviewVersions: false + solution: umbraco.sln + buildConfiguration: SkipTests + DOTNET_NOLOGO: true + DOTNET_GENERATE_ASPNET_CERTIFICATE: false + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: true + jobs: CodeQL-Build: permissions: @@ -19,24 +33,28 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v3 - with: - fetch-depth: 0 + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - config-file: ./.github/config/codeql-config.yml + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + config-file: ./.github/config/codeql-config.yml - - name: Setup dotnet - uses: actions/setup-dotnet@v2 - with: - dotnet-version: "6.0.x" + - name: Use .NET ${{ env.dotnetVersion }} + uses: actions/setup-dotnet@v2 + with: + dotnet-version: ${{ env.dotnetVersion }} + include-prerelease: ${{ env.dotnetIncludePreviewVersions }} - - name: dotnet build - run: dotnet build umbraco.sln -c SkipTests + - name: Run dotnet restore + run: dotnet restore ${{ env.solution }} - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + - name: Run dotnet build + run: dotnet build ${{ env.solution }} --configuration ${{ env.buildConfiguration }} --no-restore -p:ContinuousIntegrationBuild=true + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/.gitignore b/.gitignore index 26f96f89b7..94c804dd4a 100644 --- a/.gitignore +++ b/.gitignore @@ -104,5 +104,6 @@ cypress.env.json /tests/Umbraco.Tests.UnitTests/[Uu]mbraco/[Dd]ata/TEMP/ # Ignore auto-generated schema -/src/Umbraco.Web.UI/appsettings-schema.json /src/Umbraco.Cms/appsettings-schema.json +/src/Umbraco.Web.UI/appsettings-schema.json +/tests/Umbraco.Tests.Integration/appsettings-schema.json diff --git a/Directory.Build.props b/Directory.Build.props index 8ae2e0baec..352af20c45 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,18 +1,52 @@ - + + net6.0 + Umbraco HQ + Umbraco + Copyright © Umbraco $([System.DateTime]::Today.ToString('yyyy')) + Umbraco CMS + https://umbraco.com/ + https://umbraco.com/dist/nuget/logo-small.png + icon.png + MIT + umbraco + en-US + enable + nullable + enable + true + + + + + true + true + true + snupkg + + + + + true + 10.0.0 + true + true + + - + + + + + - - all - 3.5.107 - - - - all - + + + + $(MSBuildThisFileDirectory) + diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index f3d0ce0c1b..db92f49ff8 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -25,6 +25,7 @@ parameters: variables: nodeVersion: 14.18.1 dotnetVersion: 6.x + dotnetIncludePreviewVersions: false solution: umbraco.sln buildConfiguration: Release UMBRACO__CMS__GLOBAL__ID: 00000000-0000-0000-0000-000000000042 @@ -72,6 +73,7 @@ stages: inputs: version: $(dotnetVersion) performMultiLevelLookup: true + includePreviewVersions: $(dotnetIncludePreviewVersions) - task: DotNetCoreCLI@2 displayName: Run dotnet restore inputs: @@ -143,41 +145,41 @@ stages: - task: PowerShell@2 displayName: Install DocFX inputs: - targetType: inline - script: | - choco install docfx --version=2.59.2 -y - if ($lastexitcode -ne 0){ - throw ("Error installing DocFX") - } + targetType: inline + script: | + choco install docfx --version=2.59.2 -y + if ($lastexitcode -ne 0){ + throw ("Error installing DocFX") + } - task: PowerShell@2 displayName: Generate metadata inputs: - targetType: inline - script: | - docfx metadata "$(Build.SourcesDirectory)/build/csharp-docs/docfx.json" - if ($lastexitcode -ne 0){ - throw ("Error generating metadata.") - } + targetType: inline + script: | + docfx metadata "$(Build.SourcesDirectory)/build/csharp-docs/docfx.json" + if ($lastexitcode -ne 0){ + throw ("Error generating metadata.") + } - task: PowerShell@2 displayName: Generate documentation inputs: - targetType: inline - script: | - docfx build "$(Build.SourcesDirectory)/build/csharp-docs/docfx.json" - if ($lastexitcode -ne 0){ - throw ("Error generating documentation.") - } + targetType: inline + script: | + docfx build "$(Build.SourcesDirectory)/build/csharp-docs/docfx.json" + if ($lastexitcode -ne 0){ + throw ("Error generating documentation.") + } - task: ArchiveFiles@2 displayName: Archive C# Docs inputs: - rootFolderOrFile: $(Build.SourcesDirectory)/build/csharp-docs/_site - includeRootFolder: false - archiveFile: $(Build.ArtifactStagingDirectory)/csharp-docs.zip + rootFolderOrFile: $(Build.SourcesDirectory)/build/csharp-docs/_site + includeRootFolder: false + archiveFile: $(Build.ArtifactStagingDirectory)/csharp-docs.zip - task: PublishPipelineArtifact@1 displayName: Publish C# Docs inputs: - targetPath: $(Build.ArtifactStagingDirectory)/csharp-docs.zip - artifact: csharp-docs + targetPath: $(Build.ArtifactStagingDirectory)/csharp-docs.zip + artifact: csharp-docs # js API Reference - job: @@ -188,7 +190,7 @@ stages: - task: NodeTool@0 displayName: Use Node.js 10.15.0 inputs: - versionSpec: 10.15.0 # Won't work with 14.18.1 + versionSpec: 10.15.0 # Won't work with higher versions - script: | npm ci --no-fund --no-audit --prefer-offline npx gulp docs @@ -205,14 +207,14 @@ stages: - task: ArchiveFiles@2 displayName: Archive js Docs inputs: - rootFolderOrFile: $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Docs/api - includeRootFolder: false - archiveFile: $(Build.ArtifactStagingDirectory)/ui-docs.zip + rootFolderOrFile: $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Docs/api + includeRootFolder: false + archiveFile: $(Build.ArtifactStagingDirectory)/ui-docs.zip - task: PublishPipelineArtifact@1 displayName: Publish js Docs inputs: - targetPath: $(Build.ArtifactStagingDirectory)/ui-docs.zip - artifact: ui-docs + targetPath: $(Build.ArtifactStagingDirectory)/ui-docs.zip + artifact: ui-docs ############################################### ## Test @@ -245,6 +247,7 @@ stages: inputs: version: $(dotnetVersion) performMultiLevelLookup: true + includePreviewVersions: $(dotnetIncludePreviewVersions) - task: DotNetCoreCLI@2 displayName: Run dotnet test inputs: @@ -281,6 +284,7 @@ stages: inputs: version: $(dotnetVersion) performMultiLevelLookup: true + includePreviewVersions: $(dotnetIncludePreviewVersions) - task: DotNetCoreCLI@2 displayName: Run dotnet test inputs: @@ -371,7 +375,6 @@ stages: dockerImageName: umbraco-linux Windows: vmImage: 'windows-latest' - DOTNET_GENERATE_ASPNET_CERTIFICATE: true # Automatically generate HTTPS development certificate on Windows pool: vmImage: $(vmImage) steps: @@ -415,6 +418,7 @@ stages: inputs: version: $(dotnetVersion) performMultiLevelLookup: true + includePreviewVersions: $(dotnetIncludePreviewVersions) # Linux containers smooth - task: PowerShell@2 condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) @@ -427,11 +431,7 @@ stages: docker build -t $(dockerImageName):$sha -f $(dockerfile) . mkdir -p $(Build.ArtifactStagingDirectory)/docker-images docker save -o $(Build.ArtifactStagingDirectory)/docker-images/$(dockerImageName).$sha.tar $(dockerImageName):$sha - - # Manually generate HTTPS development certificate on Linux dotnet dev-certs https -ep ${HOME}/.aspnet/https/aspnetapp.pfx -p UmbracoAcceptance123! - dotnet dev-certs https --trust - docker run --name $(dockerImageName) -dp 8080:5000 -dp 8443:5001 -e UMBRACO__CMS__GLOBAL__ID=$(UMBRACO__CMS__GLOBAL__ID) -e ASPNETCORE_Kestrel__Certificates__Default__Password="UmbracoAcceptance123!" -e ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx -v ${HOME}/.aspnet/https:/https/ $(dockerImageName):$sha docker ps # Urls matching docker setup. @@ -443,9 +443,10 @@ stages: targetType: inline script: | dotnet new --install ./nupkg/Umbraco.Templates.*.nupkg - dotnet new umbraco --name Playwright -o . --no-restore + dotnet new umbraco --name Playwright --no-restore --output . dotnet restore --configfile ./nuget.config dotnet build --configuration $(buildConfiguration) --no-restore + dotnet dev-certs https Start-Process -FilePath "dotnet" -ArgumentList "run --configuration $(buildConfiguration) --no-build --no-launch-profile --urls $(PLAYWRIGHT_BASE_URL)" - task: PowerShell@2 displayName: Wait for app diff --git a/icon.png b/icon.png new file mode 100644 index 0000000000..8f01fe7aeb Binary files /dev/null and b/icon.png differ diff --git a/src/Directory.Build.props b/src/Directory.Build.props deleted file mode 100644 index 57fa53002f..0000000000 --- a/src/Directory.Build.props +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - 10.0.0 - 10.0.0 - 10.0.0-rc1 - 10.0.0 - 10.0 - en-US - Umbraco CMS - Copyright © Umbraco 2021 - Umbraco HQ - https://umbraco.com/ - https://umbraco.com/dist/nuget/logo-small.png - https://opensource.org/licenses/MIT - false - umbraco - git - https://github.com/umbraco/umbraco-cms - enable - Nullable - enable - true - - - - - true - - - true - - - true - snupkg - - - - - - - true - - - - - true - 10.0.0 - true - true - - diff --git a/src/JsonSchema/JsonSchema.csproj b/src/JsonSchema/JsonSchema.csproj index 93aa45929c..69aeb39ecf 100644 --- a/src/JsonSchema/JsonSchema.csproj +++ b/src/JsonSchema/JsonSchema.csproj @@ -1,36 +1,18 @@ Exe - net6.0 - true false false - - - - - - - - 3.5.107 - - + + + + + + - - - - $(UserProfile)\.nuget\packages\ - - - - - - - - diff --git a/src/JsonSchema/Options.cs b/src/JsonSchema/Options.cs index 4471ee49ce..00cb670953 100644 --- a/src/JsonSchema/Options.cs +++ b/src/JsonSchema/Options.cs @@ -7,7 +7,7 @@ namespace JsonSchema { internal class Options { - [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "../../../../Umbraco.Web.UI/appsettings-schema.json")] + [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "appsettings-schema.json")] public string OutputFile { get; set; } = null!; } } diff --git a/src/JsonSchema/UmbracoJsonSchemaGenerator.cs b/src/JsonSchema/UmbracoJsonSchemaGenerator.cs index e0293a1e1a..8cb5bafcbf 100644 --- a/src/JsonSchema/UmbracoJsonSchemaGenerator.cs +++ b/src/JsonSchema/UmbracoJsonSchemaGenerator.cs @@ -1,8 +1,6 @@ -// Copyright (c) Umbraco. +// Copyright (c) Umbraco. // See LICENSE for more details. -using System.Net.Http; -using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NJsonSchema.Generation; @@ -44,9 +42,7 @@ namespace JsonSchema var result = await response.Content.ReadAsStringAsync(); - JObject schema = JsonConvert.DeserializeObject(result)!; - - return schema; + return JsonConvert.DeserializeObject(result)!; } private JObject GenerateUmbracoSchema() diff --git a/src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj b/src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj index 3fc38651b9..d49d146a6b 100644 --- a/src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj +++ b/src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj @@ -1,35 +1,27 @@ + + Umbraco CMS - Management API + Contains the presentation layer for the Umbraco CMS Management API. + false + false + - - net6.0 - enable - enable - nullable - Umbraco.Cms.ManagementApi - false - false - - - - - - - - - - - - - - - - - all - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj index e206cd8653..6929a1bc81 100644 --- a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj @@ -1,9 +1,6 @@ - - net6.0 - Umbraco.Cms.Persistence.SqlServer - Umbraco.Cms.Persistence.SqlServer + Umbraco CMS - Persistence - SQL Server Adds support for SQL Server to Umbraco CMS. @@ -19,5 +16,4 @@ <_Parameter1>Umbraco.Tests.UnitTests - diff --git a/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj b/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj index 5aa062df17..cd88791019 100644 --- a/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj +++ b/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj @@ -1,18 +1,14 @@ - - net6.0 - Umbraco.Cms.Persistence.Sqlite - Umbraco.Cms.Persistence.Sqlite + Umbraco CMS - Persistence - SQLite Adds support for SQLite to Umbraco CMS. - - - - + + + diff --git a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj index 1fbbd8c42f..f1196689b9 100644 --- a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj +++ b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj @@ -1,20 +1,11 @@ - - net6.0 + Umbraco CMS - Static assets + Contains the static assets needed to run Umbraco CMS. true - Umbraco.Cms.StaticAssets - Contains the static assets that is required to run Umbraco CMS. / - - - true - buildTransitive - - - @@ -25,43 +16,32 @@ - $(ProjectDir)wwwroot/umbraco + $(ProjectDir)wwwroot\umbraco - - - - - - - - - + + + + + + + + + + - - - - + + + + + - - - - - - - + + - + - - - - diff --git a/src/Umbraco.Cms/Umbraco.Cms.csproj b/src/Umbraco.Cms/Umbraco.Cms.csproj index 6d7fcb195f..0ed27081a8 100644 --- a/src/Umbraco.Cms/Umbraco.Cms.csproj +++ b/src/Umbraco.Cms/Umbraco.Cms.csproj @@ -1,10 +1,8 @@ - net6.0 + Umbraco CMS + Installs Umbraco CMS with all default dependencies in your ASP.NET Core project. false - Umbraco.Cms - Umbraco.Cms - Installs Umbraco CMS in your ASP.NET Core project false @@ -16,24 +14,18 @@ - - $(ProjectDir)appsettings-schema.json - $(ProjectDir)../JsonSchema/ - - - - - - - - - - - + + + $(MSBuildThisFileDirectory)appsettings-schema.json + $(MSBuildThisFileDirectory)..\JsonSchema\ + + + + diff --git a/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.props b/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.props index 7266a05f6e..a967c4fd33 100644 --- a/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.props +++ b/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.props @@ -1,9 +1,9 @@ - $(DefaultItemExcludes);App_Plugins/** - $(DefaultItemExcludes);umbraco/Data/** - $(DefaultItemExcludes);umbraco/Logs/** - $(DefaultItemExcludes);wwwroot/media/** + $(DefaultItemExcludes);App_Plugins\** + $(DefaultItemExcludes);umbraco\Data\** + $(DefaultItemExcludes);umbraco\Logs\** + $(DefaultItemExcludes);wwwroot\media\** diff --git a/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.targets b/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.targets index bd0fdbf304..03b6f90812 100644 --- a/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.targets +++ b/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.targets @@ -3,31 +3,22 @@ $(MSBuildThisFileDirectory)..\appsettings-schema.json - + - + - - - + + - + <_AppPluginsFiles Include="App_Plugins\**" /> - - + - + <_UmbracoFolderFiles Include="umbraco\config\**" /> <_UmbracoFolderFiles Include="umbraco\PartialViewMacros\**" /> diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index feb2f37fde..727a1f756c 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -1,11 +1,9 @@ - net6.0 - Umbraco.Cms.Core - Umbraco CMS Umbraco.Cms.Core - Umbraco CMS Core - Contains the core assembly needed to run Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco + Umbraco CMS - Core + Contains the core assembly needed to run Umbraco CMS. + Umbraco.Cms.Core @@ -18,16 +16,9 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index 7bdef8928d..61b7446724 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -1,22 +1,13 @@ - net6.0 - Umbraco.Cms.Infrastructure.Examine - Umbraco CMS - Umbraco.Examine.Lucene - Umbraco.Cms.Examine.Lucene + Umbraco CMS - Examine - Lucene + Adds Examine searching support using Lucene to Umbraco CMS. + Umbraco.Cms.Infrastructure.Examine - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index dda2e536e4..c72c2022c4 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -1,32 +1,27 @@ - net6.0 - Umbraco.Cms.Infrastructure Umbraco.Cms.Infrastructure - Umbraco CMS Infrastructure - Contains the infrastructure assembly needed to run Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco + Umbraco CMS - Infrastructure + Contains the infrastructure assembly needed to run Umbraco CMS. + Umbraco.Cms.Infrastructure - - TRACE_SCOPES; + + $(DefineConstants);TRACE_SCOPES + - + - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -45,38 +40,11 @@ - - - - all - - - 3.5.107 - - <_UnmanagedRegistrationCache Remove="obj\Umbraco.Infrastructure.csproj.UnmanagedRegistration.cache" /> - - - - - True - True - Resources.resx - - - - - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - + @@ -104,6 +72,15 @@ - + + + ResXFileCodeGenerator + Resources.Designer.cs + + + True + True + Resources.resx + diff --git a/src/Umbraco.New.Cms.Core/Umbraco.New.Cms.Core.csproj b/src/Umbraco.New.Cms.Core/Umbraco.New.Cms.Core.csproj index e7c38a23af..339bff9be6 100644 --- a/src/Umbraco.New.Cms.Core/Umbraco.New.Cms.Core.csproj +++ b/src/Umbraco.New.Cms.Core/Umbraco.New.Cms.Core.csproj @@ -1,17 +1,12 @@ + + Umbraco CMS - Core + Contains the core assembly needed to run Umbraco CMS. + false + false + - - net6.0 - enable - enable - Umbraco.New.Cms.Core - false - nullable - false - - - - - - + + + diff --git a/src/Umbraco.New.Cms.Infrastructure/Umbraco.New.Cms.Infrastructure.csproj b/src/Umbraco.New.Cms.Infrastructure/Umbraco.New.Cms.Infrastructure.csproj index 27e27cc981..8dc5d3cc00 100644 --- a/src/Umbraco.New.Cms.Infrastructure/Umbraco.New.Cms.Infrastructure.csproj +++ b/src/Umbraco.New.Cms.Infrastructure/Umbraco.New.Cms.Infrastructure.csproj @@ -1,18 +1,13 @@ + + Umbraco CMS - Infrastructure + Contains the infrastructure assembly needed to run Umbraco CMS. + false + false + - - net6.0 - enable - enable - Umbraco.New.Cms.Infrastructure - false - nullable - false - - - - - - - + + + + diff --git a/src/Umbraco.New.Cms.Web.Common/Umbraco.New.Cms.Web.Common.csproj b/src/Umbraco.New.Cms.Web.Common/Umbraco.New.Cms.Web.Common.csproj index 159537c9d8..292532ba0c 100644 --- a/src/Umbraco.New.Cms.Web.Common/Umbraco.New.Cms.Web.Common.csproj +++ b/src/Umbraco.New.Cms.Web.Common/Umbraco.New.Cms.Web.Common.csproj @@ -1,17 +1,13 @@ + + Umbraco CMS - Web + Contains the web assembly needed to run Umbraco CMS. + false + false + - - net6.0 - enable - enable - false - nullable - false - - - - - - - + + + + diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj index 12c091099e..eeccf49cf2 100644 --- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj +++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj @@ -1,24 +1,16 @@ - net6.0 - Umbraco.Cms.Infrastructure.PublishedCache Umbraco.Cms.PublishedCache.NuCache - Umbraco CMS Published Cache - Contains the Published Cache assembly needed to run Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco + Umbraco CMS - Published cache - NuCache + Contains the published cache assembly needed to run Umbraco CMS. + Umbraco.Cms.Infrastructure.PublishedCache - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj index 2f6cfe562b..952f4fbbc5 100644 --- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj +++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj @@ -1,11 +1,10 @@ - net6.0 + Umbraco.Cms.Web.BackOffice + Umbraco CMS - Web - Backoffice + Contains the backoffice assembly needed to run the backend of Umbraco CMS. Library Umbraco.Cms.Web.BackOffice - Umbraco.Cms.Web.BackOffice - Umbraco CMS Back Office - Contains the Back Office assembly needed to run the back office of Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco @@ -13,18 +12,15 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - - - 3.5.107 - + + + + + + + @@ -36,13 +32,6 @@ - - - - - - - diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index 94c3666944..8d1a22b7ae 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -1,17 +1,26 @@ - net6.0 - Library - Umbraco.Cms.Web.Common Umbraco.Cms.Web.Common - Umbraco CMS Web - Contains the Web assembly needed to run Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco + Umbraco CMS - Web + Contains the web assembly needed to run Umbraco CMS. + Umbraco.Cms.Web.Common + + + + + + + + + + + @@ -19,19 +28,6 @@ - - - - - - - - - - - - - <_Parameter1>Umbraco.Tests.UnitTests diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index c16d1debfc..b7be2ba90f 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -1,22 +1,16 @@ - net6.0 Umbraco.Cms.Web.UI false + - - - - - - @@ -34,30 +28,13 @@ false - - $(ProjectDir)appsettings-schema.json - $(ProjectDir)../JsonSchema/JsonSchema.csproj - - - - - - - - + + + - - - - - - - - - - - - + + + diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj index be4bc570d8..fb9b051667 100644 --- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj +++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj @@ -1,11 +1,10 @@ - net6.0 + Umbraco.Cms.Web.Website + Umbraco CMS - Web - Website + Contains the website assembly needed to run the frontend of Umbraco CMS. Library Umbraco.Cms.Web.Website - Umbraco.Cms.Web.Website - Umbraco CMS Website - Contains the Website assembly needed to run Umbraco Cms (Front office). This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco @@ -18,19 +17,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - - - 3.5.107 - - - <_Parameter1>Umbraco.Tests.UnitTests diff --git a/templates/Umbraco.Templates.csproj b/templates/Umbraco.Templates.csproj index d01e811cde..2f96bdf61f 100644 --- a/templates/Umbraco.Templates.csproj +++ b/templates/Umbraco.Templates.csproj @@ -1,19 +1,16 @@ - net6.0 + Umbraco CMS - Templates + Coontains templates for Umbraco CMS. Template false - . + false true true - false . - true - false - diff --git a/templates/UmbracoPackage/UmbracoPackage.csproj b/templates/UmbracoPackage/UmbracoPackage.csproj index cdab2646e0..8ddba31890 100644 --- a/templates/UmbracoPackage/UmbracoPackage.csproj +++ b/templates/UmbracoPackage/UmbracoPackage.csproj @@ -1,4 +1,4 @@ - + net6.0 . @@ -16,13 +16,7 @@ - - true - Always - - - true - buildTransitive - + + diff --git a/templates/UmbracoPackage/build/UmbracoPackage.targets b/templates/UmbracoPackage/build/UmbracoPackage.targets deleted file mode 100644 index 30fff5c159..0000000000 --- a/templates/UmbracoPackage/build/UmbracoPackage.targets +++ /dev/null @@ -1,21 +0,0 @@ - - - $(MSBuildThisFileDirectory)..\App_Plugins\UmbracoPackage\**\*.* - - - - - - - - - - - - - - - - - - diff --git a/templates/UmbracoPackage/buildTransitive/UmbracoPackage.targets b/templates/UmbracoPackage/buildTransitive/UmbracoPackage.targets new file mode 100644 index 0000000000..2bd0156cca --- /dev/null +++ b/templates/UmbracoPackage/buildTransitive/UmbracoPackage.targets @@ -0,0 +1,21 @@ + + + $(MSBuildThisFileDirectory)..\App_Plugins\UmbracoPackage\**\*.* + + + + + + + + + + + + + + + + + + diff --git a/templates/icon.png b/templates/icon.png deleted file mode 100644 index 6e94105808..0000000000 Binary files a/templates/icon.png and /dev/null differ diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 0726083c36..9768d3ee8e 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -2,6 +2,11 @@ + + + annotations + + $(MSBuildThisFileDirectory)codeanalysis.ruleset diff --git a/tests/Umbraco.TestData/Umbraco.TestData.csproj b/tests/Umbraco.TestData/Umbraco.TestData.csproj index b5b2c5c99f..64772d371e 100644 --- a/tests/Umbraco.TestData/Umbraco.TestData.csproj +++ b/tests/Umbraco.TestData/Umbraco.TestData.csproj @@ -1,9 +1,8 @@ - - false Umbraco.TestData - net6.0 + false + false @@ -16,5 +15,4 @@ - diff --git a/tests/Umbraco.Tests.AcceptanceTest/misc/Directory.Build.props b/tests/Umbraco.Tests.AcceptanceTest/misc/Directory.Build.props new file mode 100644 index 0000000000..33a5cccb0b --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/misc/Directory.Build.props @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/tests/Umbraco.Tests.AcceptanceTest/misc/nuget.config b/tests/Umbraco.Tests.AcceptanceTest/misc/nuget.config index c02a885f65..08b6b81193 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/misc/nuget.config +++ b/tests/Umbraco.Tests.AcceptanceTest/misc/nuget.config @@ -1,6 +1,7 @@ + diff --git a/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker b/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker index f111f6e48c..2e549a5312 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker +++ b/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker @@ -11,9 +11,10 @@ COPY nupkg . WORKDIR /build RUN dotnet new --install /nupkg/Umbraco.Templates.*.nupkg -RUN dotnet new umbraco --name Playwright -o . --no-restore +RUN dotnet new umbraco --name Playwright --no-restore --output . RUN dotnet restore --configfile /nuget.config -RUN dotnet publish --no-restore --configuration Release -o /dist +RUN dotnet build --configuration Release --no-restore +RUN dotnet publish --configuration Release --no-build --output /dist ############################################ ## Run diff --git a/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj index 29e0a36353..cf1e6c383d 100644 --- a/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj +++ b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj @@ -1,18 +1,17 @@ - net6.0 Exe false false + false - - - - - - + + + + + @@ -20,19 +19,4 @@ - - - - 0.13.1 - - - 6.0.0 - - - 4.18.1 - - - - - diff --git a/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj b/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj index 05a5554db2..82cf5d9c32 100644 --- a/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj +++ b/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj @@ -1,20 +1,13 @@ - - net6.0 - Umbraco.Cms.Tests.Common - Umbraco.Cms.Tests - Umbraco CMS Test Tools - Contains commonly used tools to write tests for Umbraco CMS, such as various builders for content etc. - true + Umbraco.Cms.Tests + Umbraco CMS - Test tools + Contains commonly used tools to write tests for Umbraco CMS, such as various builders for content etc. + Umbraco.Cms.Tests.Common - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs index ae99c7e009..6ae7f3628e 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; using Examine; using Examine.Lucene; using Examine.Lucene.Directories; using Lucene.Net.Analysis; using Lucene.Net.Analysis.Standard; -using Lucene.Net.Store; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Moq; @@ -22,6 +18,7 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; using Umbraco.Cms.Infrastructure.Examine; using Umbraco.Cms.Infrastructure.Persistence; +using Directory = Lucene.Net.Store.Directory; namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine; diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs index 0d5a6bf0be..1a9a37fd3b 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; using Examine; using Examine.Lucene; using Examine.Lucene.Directories; using Examine.Lucene.Providers; -using Lucene.Net.Store; using Microsoft.Extensions.Logging; using Moq; using NUnit.Framework; @@ -14,6 +10,7 @@ using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Infrastructure; using Umbraco.Cms.Infrastructure.Examine; using Umbraco.Cms.Tests.Common.Testing; +using Directory = Lucene.Net.Store.Directory; namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine; diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj index d83e957ecf..10424d2c14 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj +++ b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj @@ -1,119 +1,51 @@ - net6.0 - Umbraco.Cms.Tests.Integration Umbraco.Cms.Tests.Integration - Umbraco CMS Integration Tests - Contains helper classes for integration tests with Umbraco, including all internal integration tests. - true + Umbraco CMS - Integration tests + Contains helper classes for integration tests with Umbraco CMS, including all internal integration tests. true + Umbraco.Cms.Tests.Integration - - - - + + + + + + + - - IS_WINDOWS - + + + + + + + - - - - - - - - - - - - - - ResXFileCodeGenerator - TestFiles.Designer.cs - - - ResXFileCodeGenerator - ImportResources.Designer.cs Designer + TestFiles.Designer.cs True True TestFiles.resx + + + ResXFileCodeGenerator + Designer + ImportResources.Designer.cs + - True True + True ImportResources.resx - - - - - - - - - - - Designer - - - - - - - - - Designer - - - - - - - PreserveNewest - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - Designer - + diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj index 33f9d1884c..fcbb4d6908 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj @@ -1,47 +1,25 @@ - Exe - net6.0 + true Umbraco.Cms.Tests.UnitTests false - true + false - - - - - - - - - - - - - - - - + - + + + + + - - - - - - - - - - diff --git a/umbraco.sln b/umbraco.sln index e0ff14115c..fde6121b7d 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -4,13 +4,12 @@ VisualStudioVersion = 17.1.32328.378 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}" - ProjectSection(SolutionItems) = preProject - build\azure-pipelines.yml = build\azure-pipelines.yml - version.json = version.json - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B5BD12C1-A454-435E-8A46-FF4A364C0382}" + ProjectSection(SolutionItems) = preProject + tests\.editorconfig = tests\.editorconfig + tests\codeanalysis.ruleset = tests\codeanalysis.ruleset + tests\Directory.Build.props = tests\Directory.Build.props + EndProjectSection EndProject Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.Client", "http://localhost:3961", "{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}" ProjectSection(WebsiteProperties) = preProject @@ -101,24 +100,44 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NewBackoffice", "NewBackoff .github\New BackOffice - README.md = .github\New BackOffice - README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.ManagementApi", "src\Umbraco.Cms.ManagementApi\Umbraco.Cms.ManagementApi.csproj", "{0946531B-F06D-415B-A4E3-6CBFF5DB1C12}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.ManagementApi", "src\Umbraco.Cms.ManagementApi\Umbraco.Cms.ManagementApi.csproj", "{0946531B-F06D-415B-A4E3-6CBFF5DB1C12}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.New.Cms.Core", "src\Umbraco.New.Cms.Core\Umbraco.New.Cms.Core.csproj", "{CBCE0A1E-BF29-49A6-9581-EAB3587D823A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.New.Cms.Core", "src\Umbraco.New.Cms.Core\Umbraco.New.Cms.Core.csproj", "{CBCE0A1E-BF29-49A6-9581-EAB3587D823A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.New.Cms.Infrastructure", "src\Umbraco.New.Cms.Infrastructure\Umbraco.New.Cms.Infrastructure.csproj", "{2D978DAF-8F48-4D59-8FEA-7EF0F40DBC2C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.New.Cms.Infrastructure", "src\Umbraco.New.Cms.Infrastructure\Umbraco.New.Cms.Infrastructure.csproj", "{2D978DAF-8F48-4D59-8FEA-7EF0F40DBC2C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.New.Cms.Web.Common", "src\Umbraco.New.Cms.Web.Common\Umbraco.New.Cms.Web.Common.csproj", "{5ED13EC6-399E-49D5-9D26-86501729B08D}" -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{D4C3395A-BA9D-4032-9ED3-09F1FC032CBC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.New.Cms.Web.Common", "src\Umbraco.New.Cms.Web.Common\Umbraco.New.Cms.Web.Common.csproj", "{5ED13EC6-399E-49D5-9D26-86501729B08D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E5D4B5F9-6CCE-46CE-8985-9A350445F92B}" ProjectSection(SolutionItems) = preProject - build\csharp-docs\docfx.filter.yml = build\csharp-docs\docfx.filter.yml - build\csharp-docs\toc.yml = build\csharp-docs\toc.yml - build\csharp-docs\docfx.json = build\csharp-docs\docfx.json - build\csharp-docs\index.md = build\csharp-docs\index.md + .artifactignore = .artifactignore + .editorconfig = .editorconfig + .gitattributes = .gitattributes + .gitignore = .gitignore + .globalconfig = .globalconfig + Directory.Build.props = Directory.Build.props + icon.png = icon.png + LICENSE.md = LICENSE.md + umbraco.sln.DotSettings = umbraco.sln.DotSettings + version.json = version.json EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templating", "Templating", "{5FBDD50D-7A86-4F4D-BEB9-7967FBA4ED2C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{20CE9C97-9314-4A19-BCF1-D12CF49B7205}" + ProjectSection(SolutionItems) = preProject + build\azure-pipelines.yml = build\azure-pipelines.yml + EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Partials", "Partials", "{55B028A8-6294-46A4-BED5-7888ADB92368}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "csharp-docs", "csharp-docs", "{F2BF84D9-0A14-40AF-A0F3-B9BBBBC16A44}" + ProjectSection(SolutionItems) = preProject + build\csharp-docs\docfx.filter.yml = build\csharp-docs\docfx.filter.yml + build\csharp-docs\docfx.json = build\csharp-docs\docfx.json + build\csharp-docs\index.md = build\csharp-docs\index.md + build\csharp-docs\toc.yml = build\csharp-docs\toc.yml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "umbracotemplate", "umbracotemplate", "{2B47AD9F-FFF1-448A-88F1-D4F568811738}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "partials", "partials", "{25AECCB5-B187-4406-844B-91B8FF0FCB37}" ProjectSection(SolutionItems) = preProject build\csharp-docs\umbracotemplate\partials\class.tmpl.partial = build\csharp-docs\umbracotemplate\partials\class.tmpl.partial build\csharp-docs\umbracotemplate\partials\footer.tmpl.partial = build\csharp-docs\umbracotemplate\partials\footer.tmpl.partial @@ -128,7 +147,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Partials", "Partials", "{55 build\csharp-docs\umbracotemplate\partials\rest.tmpl.partial = build\csharp-docs\umbracotemplate\partials\rest.tmpl.partial EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Styles", "Styles", "{6499F81C-CFF2-4F83-9105-83F7880879F8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styles", "styles", "{EA628ABD-624E-4AF3-B548-6710D4D66531}" ProjectSection(SolutionItems) = preProject build\csharp-docs\umbracotemplate\styles\main.css = build\csharp-docs\umbracotemplate\styles\main.css EndProjectSection @@ -295,10 +314,11 @@ Global {CBCE0A1E-BF29-49A6-9581-EAB3587D823A} = {995D9EFA-8BB1-4333-80AD-C525A06FD984} {2D978DAF-8F48-4D59-8FEA-7EF0F40DBC2C} = {995D9EFA-8BB1-4333-80AD-C525A06FD984} {5ED13EC6-399E-49D5-9D26-86501729B08D} = {995D9EFA-8BB1-4333-80AD-C525A06FD984} - {D4C3395A-BA9D-4032-9ED3-09F1FC032CBC} = {2849E9D4-3B4E-40A3-A309-F3CB4F0E125F} - {5FBDD50D-7A86-4F4D-BEB9-7967FBA4ED2C} = {D4C3395A-BA9D-4032-9ED3-09F1FC032CBC} - {55B028A8-6294-46A4-BED5-7888ADB92368} = {5FBDD50D-7A86-4F4D-BEB9-7967FBA4ED2C} - {6499F81C-CFF2-4F83-9105-83F7880879F8} = {5FBDD50D-7A86-4F4D-BEB9-7967FBA4ED2C} + {20CE9C97-9314-4A19-BCF1-D12CF49B7205} = {E5D4B5F9-6CCE-46CE-8985-9A350445F92B} + {F2BF84D9-0A14-40AF-A0F3-B9BBBBC16A44} = {20CE9C97-9314-4A19-BCF1-D12CF49B7205} + {2B47AD9F-FFF1-448A-88F1-D4F568811738} = {F2BF84D9-0A14-40AF-A0F3-B9BBBBC16A44} + {25AECCB5-B187-4406-844B-91B8FF0FCB37} = {2B47AD9F-FFF1-448A-88F1-D4F568811738} + {EA628ABD-624E-4AF3-B548-6710D4D66531} = {2B47AD9F-FFF1-448A-88F1-D4F568811738} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC} diff --git a/version.json b/version.json index 1b7f726e3f..87470ec09b 100644 --- a/version.json +++ b/version.json @@ -2,20 +2,19 @@ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "10.3.0-rc", "assemblyVersion": { - "precision": "Build" // optional. Use when you want a more precise assembly version than the default major.minor. + "precision": "build" }, "gitCommitIdShortFixedLength": 7, + "nuGetPackageVersion": { + "semVer": 2.0 + }, "publicReleaseRefSpec": [ - "^refs/heads/master$", "^refs/heads/main$", - "^refs/heads/release/\\d+\\.\\d+\\.\\d+" + "^refs/heads/release/" ], "cloudBuild": { "buildNumber": { "enabled": true } - }, - "nugetPackageVersion": { - "semVer": 2 } }