Skip to content

Commit 00bf79e

Browse files
vatsan-madhavanvatsan-madhavan
authored
branding update for release/3.0 branch (#340)
* Update dependencies from https://github.com/dotnet/arcade build 20190207.1 (#332) This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19107.1 * Update dependencies from https://github.com/dotnet/corefx build 20190207.12 (#333) This change updates the following dependencies - System.CodeDom - 4.6.0-preview.19107.12 - Microsoft.Win32.Registry - 4.6.0-preview.19107.12 - System.Windows.Extensions - 4.6.0-preview.19107.12 - System.Configuration.ConfigurationManager - 4.6.0-preview.19107.12 - System.Reflection.TypeExtensions - 4.6.0-preview.19107.12 - System.Security.AccessControl - 4.6.0-preview.19107.12 - System.Security.Cryptography.Xml - 4.6.0-preview.19107.12 - System.Security.Permissions - 4.6.0-preview.19107.12 - System.Security.Principal.Windows - 4.6.0-preview.19107.12 - System.Reflection.Emit - 4.6.0-preview.19107.12 - System.Diagnostics.EventLog - 4.6.0-preview.19107.12 * Update dependencies from https://github.com/dotnet/arcade build 20190208.1 (#335) This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19108.1 * Update dependencies from https://github.com/dotnet/corefx build 20190208.8 (#336) This change updates the following dependencies - System.CodeDom - 4.6.0-preview.19108.8 - Microsoft.Win32.Registry - 4.6.0-preview.19108.8 - System.Windows.Extensions - 4.6.0-preview.19108.8 - System.Configuration.ConfigurationManager - 4.6.0-preview.19108.8 - System.Reflection.TypeExtensions - 4.6.0-preview.19108.8 - System.Security.AccessControl - 4.6.0-preview.19108.8 - System.Security.Cryptography.Xml - 4.6.0-preview.19108.8 - System.Security.Permissions - 4.6.0-preview.19108.8 - System.Security.Principal.Windows - 4.6.0-preview.19108.8 - System.Reflection.Emit - 4.6.0-preview.19108.8 - System.Diagnostics.EventLog - 4.6.0-preview.19108.8 * Update dependencies from dotnet/corefx (#337) * Update dependencies from https://github.com/dotnet/corefx build 20190209.6 This change updates the following dependencies - System.CodeDom - 4.6.0-preview.19109.6 - Microsoft.Win32.Registry - 4.6.0-preview.19109.6 - System.Windows.Extensions - 4.6.0-preview.19109.6 - System.Configuration.ConfigurationManager - 4.6.0-preview.19109.6 - System.Reflection.TypeExtensions - 4.6.0-preview.19109.6 - System.Security.AccessControl - 4.6.0-preview.19109.6 - System.Security.Cryptography.Xml - 4.6.0-preview.19109.6 - System.Security.Permissions - 4.6.0-preview.19109.6 - System.Security.Principal.Windows - 4.6.0-preview.19109.6 - System.Reflection.Emit - 4.6.0-preview.19109.6 - System.Diagnostics.EventLog - 4.6.0-preview.19109.6 * Update dependencies from https://github.com/dotnet/corefx build 20190210.4 This change updates the following dependencies - System.CodeDom - 4.6.0-preview.19110.4 - Microsoft.Win32.Registry - 4.6.0-preview.19110.4 - System.Windows.Extensions - 4.6.0-preview.19110.4 - System.Configuration.ConfigurationManager - 4.6.0-preview.19110.4 - System.Reflection.TypeExtensions - 4.6.0-preview.19110.4 - System.Security.AccessControl - 4.6.0-preview.19110.4 - System.Security.Cryptography.Xml - 4.6.0-preview.19110.4 - System.Security.Permissions - 4.6.0-preview.19110.4 - System.Security.Principal.Windows - 4.6.0-preview.19110.4 - System.Reflection.Emit - 4.6.0-preview.19110.4 - System.Diagnostics.EventLog - 4.6.0-preview.19110.4 * Updating branding to Preview4 (#338) * adding back platform builds * Updating branding to Preview4 (#338) * Updating branding to preview3 * passing platform to cibuild.cmd * adding _PlatformArgs to the right place * Adding release/3.0 to triggers * Removing master from list of triggers * Go back to producing packages sans preview label * Add release/3.0 to list of triggers Add release/3.0 to triggers #343 * Update comment
1 parent 42500b8 commit 00bf79e

File tree

6 files changed

+65
-46
lines changed

6 files changed

+65
-46
lines changed

‎azure-pipelines.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ variables:
99
# clean the local repo on the build agents
1010
Build.Repository.Clean: true
1111

12-
# only trigger ci builds for the master branch
12+
# only trigger ci builds for the master and release branches
1313
trigger:
1414
- master
15+
- release/3.0
1516

1617
# To be added in the future when VSTS supports this feature
1718
# only trigger pull request builds for the master branch
@@ -26,4 +27,4 @@ jobs:
2627
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
2728
agentPool: dotnet-internal-temp-vs2019
2829
# runAsPublic is used in expressions, which can't read from user-defined variables
29-
runAsPublic: false
30+
runAsPublic: false

‎eng/Version.Details.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview.19106.8">
4+
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview.19110.4">
55
<Uri>https://github.com/dotnet/corefx</Uri>
6-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
6+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
77
</Dependency>
8-
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview.19106.8">
8+
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview.19110.4">
99
<Uri>https://github.com/dotnet/corefx</Uri>
10-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
10+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
1111
</Dependency>
12-
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview.19106.8">
12+
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview.19110.4">
1313
<Uri>https://github.com/dotnet/corefx</Uri>
14-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
14+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
1515
</Dependency>
16-
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview.19106.8">
16+
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview.19110.4">
1717
<Uri>https://github.com/dotnet/corefx</Uri>
18-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
18+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
1919
</Dependency>
20-
<Dependency Name="System.Reflection.TypeExtensions" Version="4.6.0-preview.19106.8">
20+
<Dependency Name="System.Reflection.TypeExtensions" Version="4.6.0-preview.19110.4">
2121
<Uri>https://github.com/dotnet/corefx</Uri>
22-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
22+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
2323
</Dependency>
24-
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview.19106.8">
24+
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview.19110.4">
2525
<Uri>https://github.com/dotnet/corefx</Uri>
26-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
26+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
2727
</Dependency>
28-
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview.19106.8">
28+
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview.19110.4">
2929
<Uri>https://github.com/dotnet/corefx</Uri>
30-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
30+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
3131
</Dependency>
32-
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview.19106.8">
32+
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview.19110.4">
3333
<Uri>https://github.com/dotnet/corefx</Uri>
34-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
34+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
3535
</Dependency>
36-
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview.19106.8">
36+
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview.19110.4">
3737
<Uri>https://github.com/dotnet/corefx</Uri>
38-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
38+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
3939
</Dependency>
40-
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview.19106.8">
40+
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview.19110.4">
4141
<Uri>https://github.com/dotnet/corefx</Uri>
42-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
42+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
4343
</Dependency>
44-
<Dependency Name="System.CodeDom" Version="4.6.0-preview.19106.8">
44+
<Dependency Name="System.CodeDom" Version="4.6.0-preview.19110.4">
4545
<Uri>https://github.com/dotnet/corefx</Uri>
46-
<Sha>4d180567e9dc5500006b58480184f0dcfe967c1e</Sha>
46+
<Sha>224fa8e1e58b10b7fe1a5d3cfdedf2a1afbfe2e1</Sha>
4747
</Dependency>
4848
</ProductDependencies>
4949
<ToolsetDependencies>
50-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19106.4">
50+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19108.1">
5151
<Uri>https://github.com/dotnet/arcade</Uri>
52-
<Sha>b58add62b88ab28edd15932fb19f00b9e1c5e8dd</Sha>
52+
<Sha>044309163eadaad0068156f0327af458d562f171</Sha>
5353
</Dependency>
5454
</ToolsetDependencies>
5555
</Dependencies>

‎eng/Versions.props‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<VersionPrefix>4.8.0</VersionPrefix>
5-
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
5+
<PreReleaseVersionLabel>preview3</PreReleaseVersionLabel>
66
<AssemblyVersion>4.0.0.0</AssemblyVersion>
77
</PropertyGroup>
88
<!-- NuGet Package Versions -->
99
<PropertyGroup>
1010
<!-- Packages that come from https://github.com/dotnet/corefx -->
11-
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview.19106.8</MicrosoftWin32RegistryPackageVersion>
12-
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview.19106.8</SystemConfigurationConfigurationManagerPackageVersion>
13-
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview.19106.8</SystemDiagnosticsEventLogPackageVersion>
14-
<SystemReflectionEmitPackageVersion>4.6.0-preview.19106.8</SystemReflectionEmitPackageVersion>
15-
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview.19106.8</SystemReflectionTypeExtensionsPackageVersion>
16-
<SystemSecurityAccessControlPackageVersion>4.6.0-preview.19106.8</SystemSecurityAccessControlPackageVersion>
17-
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview.19106.8</SystemSecurityCryptographyXmlPackageVersion>
18-
<SystemSecurityPermissionsPackageVersion>4.6.0-preview.19106.8</SystemSecurityPermissionsPackageVersion>
19-
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview.19106.8</SystemSecurityPrincipalWindowsPackageVersion>
20-
<SystemWindowsExtensionsPackageVersion>4.6.0-preview.19106.8</SystemWindowsExtensionsPackageVersion>
21-
<SystemCodeDomPackageVersion>4.6.0-preview.19106.8</SystemCodeDomPackageVersion>
11+
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview.19110.4</MicrosoftWin32RegistryPackageVersion>
12+
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview.19110.4</SystemConfigurationConfigurationManagerPackageVersion>
13+
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview.19110.4</SystemDiagnosticsEventLogPackageVersion>
14+
<SystemReflectionEmitPackageVersion>4.6.0-preview.19110.4</SystemReflectionEmitPackageVersion>
15+
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview.19110.4</SystemReflectionTypeExtensionsPackageVersion>
16+
<SystemSecurityAccessControlPackageVersion>4.6.0-preview.19110.4</SystemSecurityAccessControlPackageVersion>
17+
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview.19110.4</SystemSecurityCryptographyXmlPackageVersion>
18+
<SystemSecurityPermissionsPackageVersion>4.6.0-preview.19110.4</SystemSecurityPermissionsPackageVersion>
19+
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview.19110.4</SystemSecurityPrincipalWindowsPackageVersion>
20+
<SystemWindowsExtensionsPackageVersion>4.6.0-preview.19110.4</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>4.6.0-preview.19110.4</SystemCodeDomPackageVersion>
2222
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
2323
<SystemReflectionTypeLoaderPackageVersion>0.1.0-preview2-181205-2</SystemReflectionTypeLoaderPackageVersion>
2424
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->

‎eng/common/templates/phases/publish-build-assets.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,15 @@ phases:
2828
SecretsFilter: 'MaestroAccessToken'
2929
condition: ${{ parameters.condition }}
3030
continueOnError: ${{ parameters.continueOnError }}
31-
- script: eng\common\publishbuildassets.cmd
32-
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
33-
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
34-
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
35-
/p:Configuration=$(_BuildConfig)
31+
- task: PowerShell@2
3632
displayName: Publish Build Assets
33+
inputs:
34+
filePath: eng\common\sdk-task.ps1
35+
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
36+
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
37+
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
38+
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
39+
/p:Configuration=$(_BuildConfig)
3740
condition: ${{ parameters.condition }}
3841
continueOnError: ${{ parameters.continueOnError }}
3942
- task: PublishBuildArtifacts@1

‎eng/pipeline.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ jobs:
3939
value: ''
4040
- name: _OfficialBuildIdArgs
4141
value: ''
42+
- name: _Platform
43+
value: x86
44+
- name: _PlatformArgs
45+
value: /p:Platform=$(_Platform)
4246

4347
# Override some values if we're building internally
4448
- ${{ if eq(parameters.runAsPublic, 'false') }}:
@@ -69,14 +73,24 @@ jobs:
6973
value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
7074
strategy:
7175
matrix:
72-
Build_Debug:
76+
Build_Debug_x86:
7377
_BuildConfig: Debug
7478
# override some variables for debug
7579
_PublishType: none
7680
_SignType: test
7781
_DotNetPublishToBlobFeed : false
78-
Build_Release:
82+
Build_Release_x86:
7983
_BuildConfig: Release
84+
Build_Debug_x64:
85+
_BuildConfig: Debug
86+
# override some variables for debug
87+
_PublishType: none
88+
_SignType: test
89+
_DotNetPublishToBlobFeed : false
90+
_Platform: x64
91+
Build_Release_x64:
92+
_BuildConfig: Release
93+
_Platform: x64
8094
steps:
8195
- checkout: self
8296
clean: true
@@ -87,4 +101,5 @@ jobs:
87101
$(_PublishArgs)
88102
$(_SignArgs)
89103
$(_OfficialBuildIdArgs)
104+
$(_PlatformArgs)
90105
displayName: Windows Build / Publish

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"version": "3.0.100-preview-010024"
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19106.4"
12+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19108.1"
1313
}
1414
}

0 commit comments

Comments
 (0)