Remove date number from dev build version#1835

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
safern merged 9 commits into from
Jan 24, 2020
Merged

Remove date number from dev build version #1835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e10218
Remove date number from dev build version
dagood Jan 16, 2020
642d09b
Set Library assembly version back to 5.0.0.0
dagood Jan 17, 2020
0aac40a
Merge remote-tracking branch 'dotnet/master' into rm-date
safern Jan 21, 2020
0e70f8f
Use default assembly version in versions.props and fix package testing
safern Jan 22, 2020
785b157
Add missed change to define AssemblyVersion to match MajorVersion.Min…
safern Jan 22, 2020
4665892
Don't change AssemblyVersions in installer, leave as it was
safern Jan 22, 2020
35babe3
Fix installer tests
safern Jan 23, 2020
6c19aa8
Merge remote-tracking branch 'dotnet/master' into rm-date
safern Jan 23, 2020
4525288
Move AssemblyVersion for installer test assets to right place
safern Jan 24, 2020
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
6 changes: 3 additions & 3 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
8 changes: 5 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,12 @@
<MajorVersion>5</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<!-- Always use shipping version instead of dummy version -->
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>

@safernsafernJan 16, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we leave this set to true when we're in an Official build? So that package versions are unique?

@dagooddagoodJan 16, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary. https://github.com/dotnet/arcade/blob/bca68c2df2c6230389f10def3880a61db266c6c1/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L39

@safernsafernJan 16, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, arcade is ahead of me 😄

<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>
Expand DownExpand Up@@ -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>

@dagooddagoodJan 22, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned that this version is being used... the installer tests need to be running on the current build's outputs or else they aren't covering anything. 😕 Can you link the issue you mentioned you'd file for this?

@safernsafernJan 22, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised the installer tests use this property, I thought this property was used by package testing only.

I mentioned it here:
#1823 (comment)

Could you elaborate how the installer tests use this instead of the recently built product?

@dagooddagoodJan 22, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate how the installer tests use this instead of the recently built product?

No, I'm not familiar with it and I'm surprised by it when you mentioned you had to change this to make the installer tests work.

@safernsafernJan 22, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't mean installer tests, I mean libraries all configuration package tests... we run some tests on our oob packages to make sure closure is complete and that we don't ship duplicate types and that all supported rids for those packages publish correctly, etc.

@dagooddagoodJan 22, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. This should be moved out from <!-- Installer dependencies --> then, it seems to me. Thanks for the background.

@safernsafernJan 22, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, that was a result from the repo merge as in corefx it was "core-setup dependencies" maybe when we consolidated it was just a find and replace from "core-setup" to "installer". Will remove.

@safernsafernJan 23, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, what it means is that those dependencies as built by the installer. If you look the file, those comments split the sections on where are those packages coming from, for example look at runtime-assets dependencies which comes from https://github.com/dotnet/runtime-assets or arcade dependencies.

@dagooddagoodJan 23, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that makes sense. Sorry for the confusion on this, no need to change it.

<MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
Expand Down
3 changes: 3 additions & 0 deletions src/installer/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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'">
Expand Down
5 changes: 5 additions & 0 deletions src/installer/test/Assets/TestUtils/TestProjects.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove date number from dev build version#1835

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

safern
merged 9 commits into

from

Jan 24, 2020
 Merged


Remove date number from dev build version
#1835
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9e10218

Remove date number from dev build version


dagood Jan 16, 2020
642d09b

Set Library assembly version back to 5.0.0.0


dagood Jan 17, 2020
0aac40a

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 21, 2020
0e70f8f

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


safern Jan 22, 2020
785b157

Add missed change to define AssemblyVersion to match MajorVersion.Min…


safern Jan 22, 2020
4665892

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


safern Jan 22, 2020
35babe3

Fix installer tests


safern Jan 23, 2020
6c19aa8

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 23, 2020
4525288

Move AssemblyVersion for installer test assets to right place


safern Jan 24, 2020

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


6 changes: 3 additions & 3 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

8 changes: 5 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,12 @@
 <MajorVersion>5</MajorVersion>
 <MinorVersion>0</MinorVersion>
 <PatchVersion>0</PatchVersion>
 <!-- Always use shipping version instead of dummy version -->
 <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we leave this set to true when we're in an Official build? So that package versions are unique?
@dagooddagoodJan 16, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary. https://github.com/dotnet/arcade/blob/bca68c2df2c6230389f10def3880a61db266c6c1/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L39
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, arcade is ahead of me 😄
 <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>
Expand DownExpand Up@@ -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>
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned that this version is being used... the installer tests need to be running on the current build's outputs or else they aren't covering anything. 😕 Can you link the issue you mentioned you'd file for this?
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised the installer tests use this property, I thought this property was used by package testing only.
I mentioned it here:
#1823 (comment)
Could you elaborate how the installer tests use this instead of the recently built product?
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate how the installer tests use this instead of the recently built product?
No, I'm not familiar with it and I'm surprised by it when you mentioned you had to change this to make the installer tests work.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't mean installer tests, I mean libraries all configuration package tests... we run some tests on our oob packages to make sure closure is complete and that we don't ship duplicate types and that all supported rids for those packages publish correctly, etc.
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. This should be moved out from <!-- Installer dependencies --> then, it seems to me. Thanks for the background.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, that was a result from the repo merge as in corefx it was "core-setup dependencies" maybe when we consolidated it was just a find and replace from "core-setup" to "installer". Will remove.
@safernsafernJan 23, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, what it means is that those dependencies as built by the installer. If you look the file, those comments split the sections on where are those packages coming from, for example look at runtime-assets dependencies which comes from https://github.com/dotnet/runtime-assets or arcade dependencies.
@dagooddagoodJan 23, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that makes sense. Sorry for the confusion on this, no need to change it.
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
 <MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostPolicyVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
Expand Down

3 changes: 3 additions & 0 deletions
src/installer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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'">
Expand Down

5 changes: 5 additions & 0 deletions
src/installer/test/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove date number from dev build version#1835

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

safern
merged 9 commits into

from

Jan 24, 2020
 Merged


Remove date number from dev build version
#1835
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9e10218

Remove date number from dev build version


dagood Jan 16, 2020
642d09b

Set Library assembly version back to 5.0.0.0


dagood Jan 17, 2020
0aac40a

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 21, 2020
0e70f8f

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


safern Jan 22, 2020
785b157

Add missed change to define AssemblyVersion to match MajorVersion.Min…


safern Jan 22, 2020
4665892

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


safern Jan 22, 2020
35babe3

Fix installer tests


safern Jan 23, 2020
6c19aa8

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 23, 2020
4525288

Move AssemblyVersion for installer test assets to right place


safern Jan 24, 2020

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


6 changes: 3 additions & 3 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

8 changes: 5 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,12 @@
 <MajorVersion>5</MajorVersion>
 <MinorVersion>0</MinorVersion>
 <PatchVersion>0</PatchVersion>
 <!-- Always use shipping version instead of dummy version -->
 <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we leave this set to true when we're in an Official build? So that package versions are unique?
@dagooddagoodJan 16, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary. https://github.com/dotnet/arcade/blob/bca68c2df2c6230389f10def3880a61db266c6c1/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L39
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, arcade is ahead of me 😄
 <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>
Expand DownExpand Up@@ -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>
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned that this version is being used... the installer tests need to be running on the current build's outputs or else they aren't covering anything. 😕 Can you link the issue you mentioned you'd file for this?
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised the installer tests use this property, I thought this property was used by package testing only.
I mentioned it here:
#1823 (comment)
Could you elaborate how the installer tests use this instead of the recently built product?
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate how the installer tests use this instead of the recently built product?
No, I'm not familiar with it and I'm surprised by it when you mentioned you had to change this to make the installer tests work.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't mean installer tests, I mean libraries all configuration package tests... we run some tests on our oob packages to make sure closure is complete and that we don't ship duplicate types and that all supported rids for those packages publish correctly, etc.
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. This should be moved out from <!-- Installer dependencies --> then, it seems to me. Thanks for the background.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, that was a result from the repo merge as in corefx it was "core-setup dependencies" maybe when we consolidated it was just a find and replace from "core-setup" to "installer". Will remove.
@safernsafernJan 23, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, what it means is that those dependencies as built by the installer. If you look the file, those comments split the sections on where are those packages coming from, for example look at runtime-assets dependencies which comes from https://github.com/dotnet/runtime-assets or arcade dependencies.
@dagooddagoodJan 23, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that makes sense. Sorry for the confusion on this, no need to change it.
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
 <MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostPolicyVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
Expand Down

3 changes: 3 additions & 0 deletions
src/installer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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'">
Expand Down

5 changes: 5 additions & 0 deletions
src/installer/test/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove date number from dev build version#1835

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

safern
merged 9 commits into

from

Jan 24, 2020
 Merged


Remove date number from dev build version
#1835
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9e10218

Remove date number from dev build version


dagood Jan 16, 2020
642d09b

Set Library assembly version back to 5.0.0.0


dagood Jan 17, 2020
0aac40a

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 21, 2020
0e70f8f

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


safern Jan 22, 2020
785b157

Add missed change to define AssemblyVersion to match MajorVersion.Min…


safern Jan 22, 2020
4665892

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


safern Jan 22, 2020
35babe3

Fix installer tests


safern Jan 23, 2020
6c19aa8

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 23, 2020
4525288

Move AssemblyVersion for installer test assets to right place


safern Jan 24, 2020

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


6 changes: 3 additions & 3 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

8 changes: 5 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,12 @@
 <MajorVersion>5</MajorVersion>
 <MinorVersion>0</MinorVersion>
 <PatchVersion>0</PatchVersion>
 <!-- Always use shipping version instead of dummy version -->
 <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we leave this set to true when we're in an Official build? So that package versions are unique?
@dagooddagoodJan 16, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary. https://github.com/dotnet/arcade/blob/bca68c2df2c6230389f10def3880a61db266c6c1/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L39
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, arcade is ahead of me 😄
 <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>
Expand DownExpand Up@@ -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>
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned that this version is being used... the installer tests need to be running on the current build's outputs or else they aren't covering anything. 😕 Can you link the issue you mentioned you'd file for this?
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised the installer tests use this property, I thought this property was used by package testing only.
I mentioned it here:
#1823 (comment)
Could you elaborate how the installer tests use this instead of the recently built product?
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate how the installer tests use this instead of the recently built product?
No, I'm not familiar with it and I'm surprised by it when you mentioned you had to change this to make the installer tests work.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't mean installer tests, I mean libraries all configuration package tests... we run some tests on our oob packages to make sure closure is complete and that we don't ship duplicate types and that all supported rids for those packages publish correctly, etc.
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. This should be moved out from <!-- Installer dependencies --> then, it seems to me. Thanks for the background.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, that was a result from the repo merge as in corefx it was "core-setup dependencies" maybe when we consolidated it was just a find and replace from "core-setup" to "installer". Will remove.
@safernsafernJan 23, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, what it means is that those dependencies as built by the installer. If you look the file, those comments split the sections on where are those packages coming from, for example look at runtime-assets dependencies which comes from https://github.com/dotnet/runtime-assets or arcade dependencies.
@dagooddagoodJan 23, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that makes sense. Sorry for the confusion on this, no need to change it.
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
 <MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostPolicyVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
Expand Down

3 changes: 3 additions & 0 deletions
src/installer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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'">
Expand Down

5 changes: 5 additions & 0 deletions
src/installer/test/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove date number from dev build version#1835

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

safern
merged 9 commits into

from

Jan 24, 2020
 Merged


Remove date number from dev build version
#1835
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9e10218

Remove date number from dev build version


dagood Jan 16, 2020
642d09b

Set Library assembly version back to 5.0.0.0


dagood Jan 17, 2020
0aac40a

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 21, 2020
0e70f8f

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


safern Jan 22, 2020
785b157

Add missed change to define AssemblyVersion to match MajorVersion.Min…


safern Jan 22, 2020
4665892

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


safern Jan 22, 2020
35babe3

Fix installer tests


safern Jan 23, 2020
6c19aa8

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 23, 2020
4525288

Move AssemblyVersion for installer test assets to right place


safern Jan 24, 2020

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


6 changes: 3 additions & 3 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

8 changes: 5 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,12 @@
 <MajorVersion>5</MajorVersion>
 <MinorVersion>0</MinorVersion>
 <PatchVersion>0</PatchVersion>
 <!-- Always use shipping version instead of dummy version -->
 <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we leave this set to true when we're in an Official build? So that package versions are unique?
@dagooddagoodJan 16, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary. https://github.com/dotnet/arcade/blob/bca68c2df2c6230389f10def3880a61db266c6c1/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L39
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, arcade is ahead of me 😄
 <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>
Expand DownExpand Up@@ -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>
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned that this version is being used... the installer tests need to be running on the current build's outputs or else they aren't covering anything. 😕 Can you link the issue you mentioned you'd file for this?
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised the installer tests use this property, I thought this property was used by package testing only.
I mentioned it here:
#1823 (comment)
Could you elaborate how the installer tests use this instead of the recently built product?
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate how the installer tests use this instead of the recently built product?
No, I'm not familiar with it and I'm surprised by it when you mentioned you had to change this to make the installer tests work.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't mean installer tests, I mean libraries all configuration package tests... we run some tests on our oob packages to make sure closure is complete and that we don't ship duplicate types and that all supported rids for those packages publish correctly, etc.
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. This should be moved out from <!-- Installer dependencies --> then, it seems to me. Thanks for the background.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, that was a result from the repo merge as in corefx it was "core-setup dependencies" maybe when we consolidated it was just a find and replace from "core-setup" to "installer". Will remove.
@safernsafernJan 23, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, what it means is that those dependencies as built by the installer. If you look the file, those comments split the sections on where are those packages coming from, for example look at runtime-assets dependencies which comes from https://github.com/dotnet/runtime-assets or arcade dependencies.
@dagooddagoodJan 23, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that makes sense. Sorry for the confusion on this, no need to change it.
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
 <MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostPolicyVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
Expand Down

3 changes: 3 additions & 0 deletions
src/installer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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'">
Expand Down

5 changes: 5 additions & 0 deletions
src/installer/test/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove date number from dev build version#1835

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

safern
merged 9 commits into

from

Jan 24, 2020
 Merged


Remove date number from dev build version
#1835
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9e10218

Remove date number from dev build version


dagood Jan 16, 2020
642d09b

Set Library assembly version back to 5.0.0.0


dagood Jan 17, 2020
0aac40a

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 21, 2020
0e70f8f

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


safern Jan 22, 2020
785b157

Add missed change to define AssemblyVersion to match MajorVersion.Min…


safern Jan 22, 2020
4665892

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


safern Jan 22, 2020
35babe3

Fix installer tests


safern Jan 23, 2020
6c19aa8

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 23, 2020
4525288

Move AssemblyVersion for installer test assets to right place


safern Jan 24, 2020

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


6 changes: 3 additions & 3 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

8 changes: 5 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,12 @@
 <MajorVersion>5</MajorVersion>
 <MinorVersion>0</MinorVersion>
 <PatchVersion>0</PatchVersion>
 <!-- Always use shipping version instead of dummy version -->
 <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we leave this set to true when we're in an Official build? So that package versions are unique?
@dagooddagoodJan 16, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary. https://github.com/dotnet/arcade/blob/bca68c2df2c6230389f10def3880a61db266c6c1/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L39
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, arcade is ahead of me 😄
 <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>
Expand DownExpand Up@@ -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>
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned that this version is being used... the installer tests need to be running on the current build's outputs or else they aren't covering anything. 😕 Can you link the issue you mentioned you'd file for this?
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised the installer tests use this property, I thought this property was used by package testing only.
I mentioned it here:
#1823 (comment)
Could you elaborate how the installer tests use this instead of the recently built product?
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate how the installer tests use this instead of the recently built product?
No, I'm not familiar with it and I'm surprised by it when you mentioned you had to change this to make the installer tests work.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't mean installer tests, I mean libraries all configuration package tests... we run some tests on our oob packages to make sure closure is complete and that we don't ship duplicate types and that all supported rids for those packages publish correctly, etc.
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. This should be moved out from <!-- Installer dependencies --> then, it seems to me. Thanks for the background.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, that was a result from the repo merge as in corefx it was "core-setup dependencies" maybe when we consolidated it was just a find and replace from "core-setup" to "installer". Will remove.
@safernsafernJan 23, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, what it means is that those dependencies as built by the installer. If you look the file, those comments split the sections on where are those packages coming from, for example look at runtime-assets dependencies which comes from https://github.com/dotnet/runtime-assets or arcade dependencies.
@dagooddagoodJan 23, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that makes sense. Sorry for the confusion on this, no need to change it.
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
 <MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostPolicyVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
Expand Down

3 changes: 3 additions & 0 deletions
src/installer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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'">
Expand Down

5 changes: 5 additions & 0 deletions
src/installer/test/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove date number from dev build version#1835

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

safern
merged 9 commits into

from

Jan 24, 2020
 Merged


Remove date number from dev build version
#1835
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9e10218

Remove date number from dev build version


dagood Jan 16, 2020
642d09b

Set Library assembly version back to 5.0.0.0


dagood Jan 17, 2020
0aac40a

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 21, 2020
0e70f8f

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


safern Jan 22, 2020
785b157

Add missed change to define AssemblyVersion to match MajorVersion.Min…


safern Jan 22, 2020
4665892

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


safern Jan 22, 2020
35babe3

Fix installer tests


safern Jan 23, 2020
6c19aa8

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 23, 2020
4525288

Move AssemblyVersion for installer test assets to right place


safern Jan 24, 2020

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


6 changes: 3 additions & 3 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

8 changes: 5 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,12 @@
 <MajorVersion>5</MajorVersion>
 <MinorVersion>0</MinorVersion>
 <PatchVersion>0</PatchVersion>
 <!-- Always use shipping version instead of dummy version -->
 <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we leave this set to true when we're in an Official build? So that package versions are unique?
@dagooddagoodJan 16, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary. https://github.com/dotnet/arcade/blob/bca68c2df2c6230389f10def3880a61db266c6c1/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L39
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, arcade is ahead of me 😄
 <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>
Expand DownExpand Up@@ -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>
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned that this version is being used... the installer tests need to be running on the current build's outputs or else they aren't covering anything. 😕 Can you link the issue you mentioned you'd file for this?
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised the installer tests use this property, I thought this property was used by package testing only.
I mentioned it here:
#1823 (comment)
Could you elaborate how the installer tests use this instead of the recently built product?
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate how the installer tests use this instead of the recently built product?
No, I'm not familiar with it and I'm surprised by it when you mentioned you had to change this to make the installer tests work.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't mean installer tests, I mean libraries all configuration package tests... we run some tests on our oob packages to make sure closure is complete and that we don't ship duplicate types and that all supported rids for those packages publish correctly, etc.
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. This should be moved out from <!-- Installer dependencies --> then, it seems to me. Thanks for the background.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, that was a result from the repo merge as in corefx it was "core-setup dependencies" maybe when we consolidated it was just a find and replace from "core-setup" to "installer". Will remove.
@safernsafernJan 23, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, what it means is that those dependencies as built by the installer. If you look the file, those comments split the sections on where are those packages coming from, for example look at runtime-assets dependencies which comes from https://github.com/dotnet/runtime-assets or arcade dependencies.
@dagooddagoodJan 23, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that makes sense. Sorry for the confusion on this, no need to change it.
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
 <MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostPolicyVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
Expand Down

3 changes: 3 additions & 0 deletions
src/installer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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'">
Expand Down

5 changes: 5 additions & 0 deletions
src/installer/test/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove date number from dev build version#1835

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

safern
merged 9 commits into

from

Jan 24, 2020
 Merged


Remove date number from dev build version
#1835
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
9e10218

Remove date number from dev build version


dagood Jan 16, 2020
642d09b

Set Library assembly version back to 5.0.0.0


dagood Jan 17, 2020
0aac40a

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 21, 2020
0e70f8f

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


safern Jan 22, 2020
785b157

Add missed change to define AssemblyVersion to match MajorVersion.Min…


safern Jan 22, 2020
4665892

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


safern Jan 22, 2020
35babe3

Fix installer tests


safern Jan 23, 2020
6c19aa8

Merge remote-tracking branch 'dotnet/master' into rm-date


safern Jan 23, 2020
4525288

Move AssemblyVersion for installer test assets to right place


safern Jan 24, 2020

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


6 changes: 3 additions & 3 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

8 changes: 5 additions & 3 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,12 @@
 <MajorVersion>5</MajorVersion>
 <MinorVersion>0</MinorVersion>
 <PatchVersion>0</PatchVersion>
 <!-- Always use shipping version instead of dummy version -->
 <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we leave this set to true when we're in an Official build? So that package versions are unique?
@dagooddagoodJan 16, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary. https://github.com/dotnet/arcade/blob/bca68c2df2c6230389f10def3880a61db266c6c1/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.BeforeCommonTargets.targets#L39
@safernsafernJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, arcade is ahead of me 😄
 <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>
Expand DownExpand Up@@ -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>
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm concerned that this version is being used... the installer tests need to be running on the current build's outputs or else they aren't covering anything. 😕 Can you link the issue you mentioned you'd file for this?
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised the installer tests use this property, I thought this property was used by package testing only.
I mentioned it here:
#1823 (comment)
Could you elaborate how the installer tests use this instead of the recently built product?
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate how the installer tests use this instead of the recently built product?
No, I'm not familiar with it and I'm surprised by it when you mentioned you had to change this to make the installer tests work.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't mean installer tests, I mean libraries all configuration package tests... we run some tests on our oob packages to make sure closure is complete and that we don't ship duplicate types and that all supported rids for those packages publish correctly, etc.
@dagooddagoodJan 22, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. This should be moved out from <!-- Installer dependencies --> then, it seems to me. Thanks for the background.
@safernsafernJan 22, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, that was a result from the repo merge as in corefx it was "core-setup dependencies" maybe when we consolidated it was just a find and replace from "core-setup" to "installer". Will remove.
@safernsafernJan 23, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, what it means is that those dependencies as built by the installer. If you look the file, those comments split the sections on where are those packages coming from, for example look at runtime-assets dependencies which comes from https://github.com/dotnet/runtime-assets or arcade dependencies.
@dagooddagoodJan 23, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that makes sense. Sorry for the confusion on this, no need to change it.
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
 <MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostPolicyVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
Expand Down

3 changes: 3 additions & 0 deletions
src/installer/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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'">
Expand Down

5 changes: 5 additions & 0 deletions
src/installer/test/Assets/TestUtils/TestProjects.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>