Skip to content

branding update for release/3.0 branch #340

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 18 commits into from
Feb 11, 2019
Merged

branding update for release/3.0 branch #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0a8a63d
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 8, 2019
6d8189a
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 8, 2019
fea93ce
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 9, 2019
66efaf1
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 9, 2019
8430bf6
Update dependencies from dotnet/corefx (#337)
dotnet-maestro[bot] Feb 11, 2019
43f5f44
Updating branding to Preview4 (#338)
vatsan-madhavan Feb 11, 2019
e7bc5d6
adding back platform builds
stevenbrix Feb 11, 2019
fd2ca8b
Updating branding to Preview4 (#338)
vatsan-madhavan Feb 11, 2019
4941d52
Updating branding to preview3
vatsan-madhavan Feb 11, 2019
4d9aad4
passing platform to cibuild.cmd
stevenbrix Feb 11, 2019
bc8ddb2
adding _PlatformArgs to the right place
stevenbrix Feb 11, 2019
5bb53eb
Merge pull request #341 from dotnet/dev/stevenbrix/addBackPlatformBuilds
stevenbrix Feb 11, 2019
385cf65
Merging from master
vatsan-madhavan Feb 11, 2019
40eb678
Adding release/3.0 to triggers
vatsan-madhavan Feb 11, 2019
ce66766
Removing master from list of triggers
vatsan-madhavan Feb 11, 2019
566b02f
Go back to producing packages sans preview label
vatsan-madhavan Feb 11, 2019
300d6fc
Add release/3.0 to list of triggers
vatsan-madhavan Feb 11, 2019
45657a7
Update comment
vatsan-madhavan Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ variables:
# clean the local repo on the build agents
Build.Repository.Clean: true

# only trigger ci builds for the master branch
# only trigger ci builds for the master and release branches
trigger:
- master
- release/3.0

# To be added in the future when VSTS supports this feature
# only trigger pull request builds for the master branch
Expand All @@ -26,4 +27,4 @@ jobs:
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
agentPool: dotnet-internal-temp-vs2019
# runAsPublic is used in expressions, which can't read from user-defined variables
runAsPublic: false
runAsPublic: false
48 changes: 24 additions & 24 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview.19106.8">
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview.19106.8">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview.19106.8">
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview.19106.8">
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
<Dependency Name="System.Reflection.TypeExtensions" Version="4.6.0-preview.19106.8">
<Dependency Name="System.Reflection.TypeExtensions" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview.19106.8">
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview.19106.8">
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview.19106.8">
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview.19106.8">
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview.19106.8">
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-preview.19106.8">
<Dependency Name="System.CodeDom" Version="4.6.0-preview.19110.4">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19106.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19108.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b58add62b88ab28edd15932fb19f00b9e1c5e8dd</Sha>
<Sha>044309163eadaad0068156f0327af458d562f171</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
24 changes: 12 additions & 12 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionPrefix>4.8.0</VersionPrefix>
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
<PreReleaseVersionLabel>preview3</PreReleaseVersionLabel>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx -->
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview.19106.8</MicrosoftWin32RegistryPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview.19106.8</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview.19106.8</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-preview.19106.8</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview.19106.8</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.6.0-preview.19106.8</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview.19106.8</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview.19106.8</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview.19106.8</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview.19106.8</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview.19106.8</SystemCodeDomPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview.19110.4</MicrosoftWin32RegistryPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview.19110.4</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview.19110.4</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-preview.19110.4</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview.19110.4</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.6.0-preview.19110.4</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview.19110.4</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview.19110.4</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview.19110.4</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview.19110.4</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview.19110.4</SystemCodeDomPackageVersion>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<SystemReflectionTypeLoaderPackageVersion>0.1.0-preview2-181205-2</SystemReflectionTypeLoaderPackageVersion>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
Expand Down
13 changes: 8 additions & 5 deletions eng/common/templates/phases/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@ phases:
SecretsFilter: 'MaestroAccessToken'
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
- script: eng\common\publishbuildassets.cmd
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
/p:Configuration=$(_BuildConfig)
- task: PowerShell@2
displayName: Publish Build Assets
inputs:
filePath: eng\common\sdk-task.ps1
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
/p:Configuration=$(_BuildConfig)
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
- task: PublishBuildArtifacts@1
Expand Down
19 changes: 17 additions & 2 deletions eng/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ jobs:
value: ''
- name: _OfficialBuildIdArgs
value: ''
- name: _Platform
value: x86
- name: _PlatformArgs
value: /p:Platform=$(_Platform)

# Override some values if we're building internally
- ${{ if eq(parameters.runAsPublic, 'false') }}:
Expand Down Expand Up @@ -69,14 +73,24 @@ jobs:
value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
strategy:
matrix:
Build_Debug:
Build_Debug_x86:
_BuildConfig: Debug
# override some variables for debug
_PublishType: none
_SignType: test
_DotNetPublishToBlobFeed : false
Build_Release:
Build_Release_x86:
_BuildConfig: Release
Build_Debug_x64:
_BuildConfig: Debug
# override some variables for debug
_PublishType: none
_SignType: test
_DotNetPublishToBlobFeed : false
_Platform: x64
Build_Release_x64:
_BuildConfig: Release
_Platform: x64
steps:
- checkout: self
clean: true
Expand All @@ -87,4 +101,5 @@ jobs:
$(_PublishArgs)
$(_SignArgs)
$(_OfficialBuildIdArgs)
$(_PlatformArgs)
displayName: Windows Build / Publish
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"version": "3.0.100-preview-010024"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19106.4"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19108.1"
}
}