提交 1e09e983 编写于 作者: D Davis Goodin 提交者: Santiago Fernandez Madero

Remove date number from dev build version (#1835)

* Remove date number from dev build version

* Set Library assembly version back to 5.0.0.0

* Use default assembly version in versions.props and fix package testing

* Add missed change to define AssemblyVersion to match MajorVersion.MinorVersion.0.0 in the root

* Don't change AssemblyVersions in installer, leave as it was

* Fix installer tests

* Move AssemblyVersion for installer test assets to right place
Co-authored-by: NSantiago Fernandez Madero <safern@microsoft.com>
上级 8f2404db
......@@ -4,9 +4,9 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha.1.19563.6">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>8743c312a9d1ce4035140046d44bb959c44f194f</Sha>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha.1.20071.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>86bfd8d46b3817e2a027b23d829cd0d035cd8ad6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="5.0.0-alpha.1.19563.6">
<Uri>https://github.com/dotnet/core-setup</Uri>
......
......@@ -6,10 +6,12 @@
<MajorVersion>5</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<!-- Always use shipping version instead of dummy version -->
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<!-- Set assembly version to align with major and minor version,
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
......@@ -43,7 +45,7 @@
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20071.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20071.3</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreAppVersion>5.0.0-alpha.1.20071.1</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
......
......@@ -13,6 +13,9 @@
<PropertyGroup>
<ArcadeSdkMSBuildProjectDir>$([System.IO.Path]::GetDirectoryName('$(ArcadeSdkBuildTasksAssembly)'))\..\</ArcadeSdkMSBuildProjectDir>
<ArcadeSdkSignProject>$(ArcadeSdkMSBuildProjectDir)Sign.proj</ArcadeSdkSignProject>
<!-- Clear AssemblyVersion as we need to align with the NuGet conventions, when empty arcade will do that for us. -->
<AssemblyVersion />
</PropertyGroup>
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
......
......@@ -15,6 +15,11 @@
win-x86 tests that assumed a win-x64 app host RID based on the runner SDK.
-->
<AppHostRuntimeIdentifier>$(TestTargetRid)</AppHostRuntimeIdentifier>
<!-- Default AssemblyVersion for test projects. We need to set it as it is set for all projects
in Versions.props to match our product version scheme and test projects are sensitive to assembly versions -->
<AssemblyVersion>1.0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册