Merge remote-tracking branch 'origin/v12/dev' into v13/dev
# Conflicts: # src/Umbraco.Core/CompatibilitySuppressions.xml # src/Umbraco.Core/Routing/UmbracoRequestPaths.cs # src/Umbraco.Infrastructure/CompatibilitySuppressions.xml # src/Umbraco.Web.BackOffice/Controllers/ContentController.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
This commit is contained in:
@@ -89,10 +89,10 @@ stages:
|
||||
arguments: '--configuration $(buildConfiguration) --no-restore -p:ContinuousIntegrationBuild=true'
|
||||
- script: |
|
||||
version="$(Build.BuildNumber)"
|
||||
echo "varsion: $version"
|
||||
echo "Version: $version"
|
||||
|
||||
major="$(echo $version | cut -d '.' -f 1)"
|
||||
echo "major version: $major"
|
||||
echo "Major version: $major"
|
||||
|
||||
echo "##vso[task.setvariable variable=majorVersion;isOutput=true]$major"
|
||||
displayName: Set major version
|
||||
@@ -113,10 +113,7 @@ stages:
|
||||
}
|
||||
}
|
||||
|
||||
foreach($csproj in Get-ChildItem -Recurse -Filter *.csproj)
|
||||
{
|
||||
dotnet pack $csproj --configuration $(buildConfiguration) --no-build --output $(Build.ArtifactStagingDirectory)/nupkg
|
||||
}
|
||||
dotnet pack $(solution) --configuration $(buildConfiguration) --no-build --property:PackageOutputPath=$(Build.ArtifactStagingDirectory)/nupkg
|
||||
- script: |
|
||||
sha="$(Build.SourceVersion)"
|
||||
sha=${sha:0:7}
|
||||
|
||||
Reference in New Issue
Block a user