Update branding for release/3.0 branch (#1674)

* Update branding to RC1
* Re-enable release/3.0 branch in triggers
* Update dependencies
This commit is contained in:
Vatsan Madhavan 2019-08-20 17:24:58 -07:00 коммит произвёл GitHub
Родитель d036864196
Коммит 66f18d4b59
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 12 добавлений и 14 удалений

Просмотреть файл

@ -35,8 +35,7 @@ trigger:
branches: branches:
include: include:
- master - master
# TODO - Re-enable when branding is decided. - release/3.0
# - release/3.0
- release/3.0-preview9 - release/3.0-preview9
# - arcade # - arcade
paths: paths:
@ -48,8 +47,7 @@ pr:
branches: branches:
include: include:
- master - master
# TODO - Re-enable when branding is decided. - release/3.0
# - release/3.0
- release/3.0-preview9 - release/3.0-preview9
paths: paths:
exclude: exclude:

Просмотреть файл

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview9.19417.1"> <Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview9.19420.1">
<Uri>https://github.com/dotnet/winforms</Uri> <Uri>https://github.com/dotnet/winforms</Uri>
<Sha>dd6650900f5af7283c6af6ec85de4d8d51f28961</Sha> <Sha>bf1631ff37ebec11b50530007e39c4beac4e34fa</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
@ -59,9 +59,9 @@
<Uri>https://github.com/dotnet/corefx</Uri> <Uri>https://github.com/dotnet/corefx</Uri>
<Sha>b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5</Sha> <Sha>b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19416-02" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19419-06" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>66a9d076b6ce2cb1dc079e5cd351439c58278daf</Sha> <Sha>5b508e86c9ce66af8b41bbc1f3b756e7724bcaa0</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19411.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19411.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
@ -75,9 +75,9 @@
<Uri>https://github.com/dotnet/corefx</Uri> <Uri>https://github.com/dotnet/corefx</Uri>
<Sha>b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5</Sha> <Sha>b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview9.19416.7"> <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.0-alpha1.19420.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>9dbf98944d032f91760e92882c80859cbf45b847</Sha> <Sha>83ab428ae9904012fbf4f109c2a5026793136966</Sha>
</Dependency> </Dependency>
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview9.19409.17" CoherentParentDependency="Microsoft.NETCore.App"> <Dependency Name="System.IO.Packaging" Version="4.6.0-preview9.19409.17" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri> <Uri>https://github.com/dotnet/corefx</Uri>

Просмотреть файл

@ -2,13 +2,13 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<VersionPrefix>4.8.0</VersionPrefix> <VersionPrefix>4.8.0</VersionPrefix>
<PreReleaseVersionLabel>preview9</PreReleaseVersionLabel> <PreReleaseVersionLabel>rc1</PreReleaseVersionLabel>
<AssemblyVersion>4.0.0.0</AssemblyVersion> <AssemblyVersion>4.0.0.0</AssemblyVersion>
<SystemIOPackagingVersion>4.6.0-preview9.19409.17</SystemIOPackagingVersion> <SystemIOPackagingVersion>4.6.0-preview9.19409.17</SystemIOPackagingVersion>
</PropertyGroup> </PropertyGroup>
<!-- NuGet Package Versions --> <!-- NuGet Package Versions -->
<PropertyGroup> <PropertyGroup>
<MicrosoftPrivateWinformsVersion>4.8.0-preview9.19417.1</MicrosoftPrivateWinformsVersion> <MicrosoftPrivateWinformsVersion>4.8.0-preview9.19420.1</MicrosoftPrivateWinformsVersion>
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr --> <!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup> <PropertyGroup>
@ -18,7 +18,7 @@
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup --> <!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup> <PropertyGroup>
<MicrosoftNETCoreAppVersion>3.0.0-preview9-19416-02</MicrosoftNETCoreAppVersion> <MicrosoftNETCoreAppVersion>3.0.0-preview9-19419-06</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-preview9.19409.17</MicrosoftNETCorePlatformsVersion> <MicrosoftNETCorePlatformsVersion>3.0.0-preview9.19409.17</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.6.0-preview9.19409.17</SystemDrawingCommonVersion> <SystemDrawingCommonVersion>4.6.0-preview9.19409.17</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.6.0-preview9.19409.17</SystemDirectoryServicesVersion> <SystemDirectoryServicesVersion>4.6.0-preview9.19409.17</SystemDirectoryServicesVersion>
@ -112,6 +112,6 @@
It is worth reiterating that this package *should not* be consumed to build the product. It is worth reiterating that this package *should not* be consumed to build the product.
--> -->
<PropertyGroup> <PropertyGroup>
<MicrosoftDotNetWpfDncEngVersion>4.8.0-preview9.19416.7</MicrosoftDotNetWpfDncEngVersion> <MicrosoftDotNetWpfDncEngVersion>5.0.0-alpha1.19420.2</MicrosoftDotNetWpfDncEngVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>