Verify ship status - #13793

Merged
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped
Aug 30, 2022
Merged

Verify ship status#13793
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped

Conversation

@KevinRansom

Copy link
Copy Markdown
Contributor

Now that the SDK build process automatically publishes FSharp.Core and FSharp.Compiler.Service, we need a mechanism to remind us to rev version numbers.

Here it is.

  • It uses an exact match packagereference to verify that the package id we think we are building hasn't been published yet.
  • It will run automatically on internal signed builds
  • not run on PR's except this one, cos I'm verifying that it works correctly in the ci environment.

It should be noted that during a build, we are not connected to nuget.org by design ... it is part of our mechanism to ensure that we don't have supply chain issues accessing public dlls.

The actual projects that we build are disconnected from the general build and set the packageroot and httpcache to a discardable location, with a random name. So ... that takes care of supply chain.

To see what it does type build -c release -verifypackageshipstatus
And observe the output this is the failing case:
image

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

Hey @brettfo , I would really appreciate, you running your eyes over this.

Thanks mate

@KevinRansomKevinRansom changed the title WIP : Do not merge : Verify ship statusVerify ship statusAug 27, 2022
@vzarytovskii

Copy link
Copy Markdown
Member

We should probably have a separate CI leg which is running on the latest release branch, @KevinRansom do you want me to take care of it? I have an idea how to deal with it.

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>

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.

These few lines shouldn't need to be here; the auto-import of Directory.Build.props should handle it and reduce the duplication.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm not a fan of putting project stuff in the Directory.Build.props and targets, it makes project files so hard to reason about.

@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />

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.

Might as well bump this import up to the Directory.Build.props level.

Comment threadeng/Build.ps1
}

$verifypackageshipstatusFailed = $false
if ($verifypackageshipstatus) {

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.

Related to Vlad's comment, pull this out into a separate file, something like eng/VerifyPackageShipStatus.ps1, that way it'll be easier to add as a separate build step and/or run locally.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

@vzarytovskii , we talked about this earlier, we agreed to run this when we merge into release branches. You can please take care of the yaml update for that :-)

@KevinRansom
KevinRansom enabled auto-merge (squash) August 30, 2022 01:28
@KevinRansom
KevinRansom merged commit d8a546d into dotnet:mainAug 30, 2022
KevinRansom added a commit that referenced this pull request Aug 30, 2022
* Revert tools.sh edit (#13796)
* Revert tools.sh edit
* Add binlog to build.sh for proto stuff
* Verify ship status (#13793)
* Verify ship status
* -verifypackageshipstatus in the right place
* more
* Update Versions.props
* Update azure-pipelines.yml
* reactivate test - Help is displayed correctly (#13792)
* tcconfig/tcconfigbuilder
* add --bufferwidth
* fantomas
* oops
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
@KevinRansom
KevinRansom deleted the packageshipped branch October 12, 2022 20:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@KevinRansom@vzarytovskii@brettfo
, '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

Verify ship status - #13793

Merged
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped
Aug 30, 2022
Merged

Verify ship status#13793
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped

Conversation

@KevinRansom

Copy link
Copy Markdown
Contributor

Now that the SDK build process automatically publishes FSharp.Core and FSharp.Compiler.Service, we need a mechanism to remind us to rev version numbers.

Here it is.

  • It uses an exact match packagereference to verify that the package id we think we are building hasn't been published yet.
  • It will run automatically on internal signed builds
  • not run on PR's except this one, cos I'm verifying that it works correctly in the ci environment.

It should be noted that during a build, we are not connected to nuget.org by design ... it is part of our mechanism to ensure that we don't have supply chain issues accessing public dlls.

The actual projects that we build are disconnected from the general build and set the packageroot and httpcache to a discardable location, with a random name. So ... that takes care of supply chain.

To see what it does type build -c release -verifypackageshipstatus
And observe the output this is the failing case:
image

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

Hey @brettfo , I would really appreciate, you running your eyes over this.

Thanks mate

@KevinRansomKevinRansom changed the title WIP : Do not merge : Verify ship statusVerify ship statusAug 27, 2022
@vzarytovskii

Copy link
Copy Markdown
Member

We should probably have a separate CI leg which is running on the latest release branch, @KevinRansom do you want me to take care of it? I have an idea how to deal with it.

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>

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.

These few lines shouldn't need to be here; the auto-import of Directory.Build.props should handle it and reduce the duplication.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm not a fan of putting project stuff in the Directory.Build.props and targets, it makes project files so hard to reason about.

@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />

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.

Might as well bump this import up to the Directory.Build.props level.

Comment threadeng/Build.ps1
}

$verifypackageshipstatusFailed = $false
if ($verifypackageshipstatus) {

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.

Related to Vlad's comment, pull this out into a separate file, something like eng/VerifyPackageShipStatus.ps1, that way it'll be easier to add as a separate build step and/or run locally.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

@vzarytovskii , we talked about this earlier, we agreed to run this when we merge into release branches. You can please take care of the yaml update for that :-)

@KevinRansom
KevinRansom enabled auto-merge (squash) August 30, 2022 01:28
@KevinRansom
KevinRansom merged commit d8a546d into dotnet:mainAug 30, 2022
KevinRansom added a commit that referenced this pull request Aug 30, 2022
* Revert tools.sh edit (#13796)
* Revert tools.sh edit
* Add binlog to build.sh for proto stuff
* Verify ship status (#13793)
* Verify ship status
* -verifypackageshipstatus in the right place
* more
* Update Versions.props
* Update azure-pipelines.yml
* reactivate test - Help is displayed correctly (#13792)
* tcconfig/tcconfigbuilder
* add --bufferwidth
* fantomas
* oops
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
@KevinRansom
KevinRansom deleted the packageshipped branch October 12, 2022 20:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@KevinRansom@vzarytovskii@brettfo
, '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

Verify ship status - #13793

Merged
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped
Aug 30, 2022
Merged

Verify ship status#13793
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped

Conversation

@KevinRansom

Copy link
Copy Markdown
Contributor

Now that the SDK build process automatically publishes FSharp.Core and FSharp.Compiler.Service, we need a mechanism to remind us to rev version numbers.

Here it is.

  • It uses an exact match packagereference to verify that the package id we think we are building hasn't been published yet.
  • It will run automatically on internal signed builds
  • not run on PR's except this one, cos I'm verifying that it works correctly in the ci environment.

It should be noted that during a build, we are not connected to nuget.org by design ... it is part of our mechanism to ensure that we don't have supply chain issues accessing public dlls.

The actual projects that we build are disconnected from the general build and set the packageroot and httpcache to a discardable location, with a random name. So ... that takes care of supply chain.

To see what it does type build -c release -verifypackageshipstatus
And observe the output this is the failing case:
image

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

Hey @brettfo , I would really appreciate, you running your eyes over this.

Thanks mate

@KevinRansomKevinRansom changed the title WIP : Do not merge : Verify ship statusVerify ship statusAug 27, 2022
@vzarytovskii

Copy link
Copy Markdown
Member

We should probably have a separate CI leg which is running on the latest release branch, @KevinRansom do you want me to take care of it? I have an idea how to deal with it.

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>

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.

These few lines shouldn't need to be here; the auto-import of Directory.Build.props should handle it and reduce the duplication.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm not a fan of putting project stuff in the Directory.Build.props and targets, it makes project files so hard to reason about.

@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />

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.

Might as well bump this import up to the Directory.Build.props level.

Comment threadeng/Build.ps1
}

$verifypackageshipstatusFailed = $false
if ($verifypackageshipstatus) {

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.

Related to Vlad's comment, pull this out into a separate file, something like eng/VerifyPackageShipStatus.ps1, that way it'll be easier to add as a separate build step and/or run locally.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

@vzarytovskii , we talked about this earlier, we agreed to run this when we merge into release branches. You can please take care of the yaml update for that :-)

@KevinRansom
KevinRansom enabled auto-merge (squash) August 30, 2022 01:28
@KevinRansom
KevinRansom merged commit d8a546d into dotnet:mainAug 30, 2022
KevinRansom added a commit that referenced this pull request Aug 30, 2022
* Revert tools.sh edit (#13796)
* Revert tools.sh edit
* Add binlog to build.sh for proto stuff
* Verify ship status (#13793)
* Verify ship status
* -verifypackageshipstatus in the right place
* more
* Update Versions.props
* Update azure-pipelines.yml
* reactivate test - Help is displayed correctly (#13792)
* tcconfig/tcconfigbuilder
* add --bufferwidth
* fantomas
* oops
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
@KevinRansom
KevinRansom deleted the packageshipped branch October 12, 2022 20:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@KevinRansom@vzarytovskii@brettfo
, '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

Verify ship status - #13793

Merged
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped
Aug 30, 2022
Merged

Verify ship status#13793
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped

Conversation

@KevinRansom

Copy link
Copy Markdown
Contributor

Now that the SDK build process automatically publishes FSharp.Core and FSharp.Compiler.Service, we need a mechanism to remind us to rev version numbers.

Here it is.

  • It uses an exact match packagereference to verify that the package id we think we are building hasn't been published yet.
  • It will run automatically on internal signed builds
  • not run on PR's except this one, cos I'm verifying that it works correctly in the ci environment.

It should be noted that during a build, we are not connected to nuget.org by design ... it is part of our mechanism to ensure that we don't have supply chain issues accessing public dlls.

The actual projects that we build are disconnected from the general build and set the packageroot and httpcache to a discardable location, with a random name. So ... that takes care of supply chain.

To see what it does type build -c release -verifypackageshipstatus
And observe the output this is the failing case:
image

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

Hey @brettfo , I would really appreciate, you running your eyes over this.

Thanks mate

@KevinRansomKevinRansom changed the title WIP : Do not merge : Verify ship statusVerify ship statusAug 27, 2022
@vzarytovskii

Copy link
Copy Markdown
Member

We should probably have a separate CI leg which is running on the latest release branch, @KevinRansom do you want me to take care of it? I have an idea how to deal with it.

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>

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.

These few lines shouldn't need to be here; the auto-import of Directory.Build.props should handle it and reduce the duplication.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm not a fan of putting project stuff in the Directory.Build.props and targets, it makes project files so hard to reason about.

@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />

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.

Might as well bump this import up to the Directory.Build.props level.

Comment threadeng/Build.ps1
}

$verifypackageshipstatusFailed = $false
if ($verifypackageshipstatus) {

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.

Related to Vlad's comment, pull this out into a separate file, something like eng/VerifyPackageShipStatus.ps1, that way it'll be easier to add as a separate build step and/or run locally.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

@vzarytovskii , we talked about this earlier, we agreed to run this when we merge into release branches. You can please take care of the yaml update for that :-)

@KevinRansom
KevinRansom enabled auto-merge (squash) August 30, 2022 01:28
@KevinRansom
KevinRansom merged commit d8a546d into dotnet:mainAug 30, 2022
KevinRansom added a commit that referenced this pull request Aug 30, 2022
* Revert tools.sh edit (#13796)
* Revert tools.sh edit
* Add binlog to build.sh for proto stuff
* Verify ship status (#13793)
* Verify ship status
* -verifypackageshipstatus in the right place
* more
* Update Versions.props
* Update azure-pipelines.yml
* reactivate test - Help is displayed correctly (#13792)
* tcconfig/tcconfigbuilder
* add --bufferwidth
* fantomas
* oops
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
@KevinRansom
KevinRansom deleted the packageshipped branch October 12, 2022 20:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@KevinRansom@vzarytovskii@brettfo
, '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

Verify ship status - #13793

Merged
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped
Aug 30, 2022
Merged

Verify ship status#13793
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped

Conversation

@KevinRansom

Copy link
Copy Markdown
Contributor

Now that the SDK build process automatically publishes FSharp.Core and FSharp.Compiler.Service, we need a mechanism to remind us to rev version numbers.

Here it is.

  • It uses an exact match packagereference to verify that the package id we think we are building hasn't been published yet.
  • It will run automatically on internal signed builds
  • not run on PR's except this one, cos I'm verifying that it works correctly in the ci environment.

It should be noted that during a build, we are not connected to nuget.org by design ... it is part of our mechanism to ensure that we don't have supply chain issues accessing public dlls.

The actual projects that we build are disconnected from the general build and set the packageroot and httpcache to a discardable location, with a random name. So ... that takes care of supply chain.

To see what it does type build -c release -verifypackageshipstatus
And observe the output this is the failing case:
image

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

Hey @brettfo , I would really appreciate, you running your eyes over this.

Thanks mate

@KevinRansomKevinRansom changed the title WIP : Do not merge : Verify ship statusVerify ship statusAug 27, 2022
@vzarytovskii

Copy link
Copy Markdown
Member

We should probably have a separate CI leg which is running on the latest release branch, @KevinRansom do you want me to take care of it? I have an idea how to deal with it.

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>

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.

These few lines shouldn't need to be here; the auto-import of Directory.Build.props should handle it and reduce the duplication.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm not a fan of putting project stuff in the Directory.Build.props and targets, it makes project files so hard to reason about.

@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />

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.

Might as well bump this import up to the Directory.Build.props level.

Comment threadeng/Build.ps1
}

$verifypackageshipstatusFailed = $false
if ($verifypackageshipstatus) {

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.

Related to Vlad's comment, pull this out into a separate file, something like eng/VerifyPackageShipStatus.ps1, that way it'll be easier to add as a separate build step and/or run locally.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

@vzarytovskii , we talked about this earlier, we agreed to run this when we merge into release branches. You can please take care of the yaml update for that :-)

@KevinRansom
KevinRansom enabled auto-merge (squash) August 30, 2022 01:28
@KevinRansom
KevinRansom merged commit d8a546d into dotnet:mainAug 30, 2022
KevinRansom added a commit that referenced this pull request Aug 30, 2022
* Revert tools.sh edit (#13796)
* Revert tools.sh edit
* Add binlog to build.sh for proto stuff
* Verify ship status (#13793)
* Verify ship status
* -verifypackageshipstatus in the right place
* more
* Update Versions.props
* Update azure-pipelines.yml
* reactivate test - Help is displayed correctly (#13792)
* tcconfig/tcconfigbuilder
* add --bufferwidth
* fantomas
* oops
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
@KevinRansom
KevinRansom deleted the packageshipped branch October 12, 2022 20:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@KevinRansom@vzarytovskii@brettfo
, '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

Verify ship status - #13793

Merged
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped
Aug 30, 2022
Merged

Verify ship status#13793
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped

Conversation

@KevinRansom

Copy link
Copy Markdown
Contributor

Now that the SDK build process automatically publishes FSharp.Core and FSharp.Compiler.Service, we need a mechanism to remind us to rev version numbers.

Here it is.

  • It uses an exact match packagereference to verify that the package id we think we are building hasn't been published yet.
  • It will run automatically on internal signed builds
  • not run on PR's except this one, cos I'm verifying that it works correctly in the ci environment.

It should be noted that during a build, we are not connected to nuget.org by design ... it is part of our mechanism to ensure that we don't have supply chain issues accessing public dlls.

The actual projects that we build are disconnected from the general build and set the packageroot and httpcache to a discardable location, with a random name. So ... that takes care of supply chain.

To see what it does type build -c release -verifypackageshipstatus
And observe the output this is the failing case:
image

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

Hey @brettfo , I would really appreciate, you running your eyes over this.

Thanks mate

@KevinRansomKevinRansom changed the title WIP : Do not merge : Verify ship statusVerify ship statusAug 27, 2022
@vzarytovskii

Copy link
Copy Markdown
Member

We should probably have a separate CI leg which is running on the latest release branch, @KevinRansom do you want me to take care of it? I have an idea how to deal with it.

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>

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.

These few lines shouldn't need to be here; the auto-import of Directory.Build.props should handle it and reduce the duplication.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm not a fan of putting project stuff in the Directory.Build.props and targets, it makes project files so hard to reason about.

@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />

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.

Might as well bump this import up to the Directory.Build.props level.

Comment threadeng/Build.ps1
}

$verifypackageshipstatusFailed = $false
if ($verifypackageshipstatus) {

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.

Related to Vlad's comment, pull this out into a separate file, something like eng/VerifyPackageShipStatus.ps1, that way it'll be easier to add as a separate build step and/or run locally.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

@vzarytovskii , we talked about this earlier, we agreed to run this when we merge into release branches. You can please take care of the yaml update for that :-)

@KevinRansom
KevinRansom enabled auto-merge (squash) August 30, 2022 01:28
@KevinRansom
KevinRansom merged commit d8a546d into dotnet:mainAug 30, 2022
KevinRansom added a commit that referenced this pull request Aug 30, 2022
* Revert tools.sh edit (#13796)
* Revert tools.sh edit
* Add binlog to build.sh for proto stuff
* Verify ship status (#13793)
* Verify ship status
* -verifypackageshipstatus in the right place
* more
* Update Versions.props
* Update azure-pipelines.yml
* reactivate test - Help is displayed correctly (#13792)
* tcconfig/tcconfigbuilder
* add --bufferwidth
* fantomas
* oops
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
@KevinRansom
KevinRansom deleted the packageshipped branch October 12, 2022 20:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@KevinRansom@vzarytovskii@brettfo
, '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

Verify ship status - #13793

Merged
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped
Aug 30, 2022
Merged

Verify ship status#13793
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped

Conversation

@KevinRansom

Copy link
Copy Markdown
Contributor

Now that the SDK build process automatically publishes FSharp.Core and FSharp.Compiler.Service, we need a mechanism to remind us to rev version numbers.

Here it is.

  • It uses an exact match packagereference to verify that the package id we think we are building hasn't been published yet.
  • It will run automatically on internal signed builds
  • not run on PR's except this one, cos I'm verifying that it works correctly in the ci environment.

It should be noted that during a build, we are not connected to nuget.org by design ... it is part of our mechanism to ensure that we don't have supply chain issues accessing public dlls.

The actual projects that we build are disconnected from the general build and set the packageroot and httpcache to a discardable location, with a random name. So ... that takes care of supply chain.

To see what it does type build -c release -verifypackageshipstatus
And observe the output this is the failing case:
image

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

Hey @brettfo , I would really appreciate, you running your eyes over this.

Thanks mate

@KevinRansomKevinRansom changed the title WIP : Do not merge : Verify ship statusVerify ship statusAug 27, 2022
@vzarytovskii

Copy link
Copy Markdown
Member

We should probably have a separate CI leg which is running on the latest release branch, @KevinRansom do you want me to take care of it? I have an idea how to deal with it.

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>

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.

These few lines shouldn't need to be here; the auto-import of Directory.Build.props should handle it and reduce the duplication.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm not a fan of putting project stuff in the Directory.Build.props and targets, it makes project files so hard to reason about.

@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />

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.

Might as well bump this import up to the Directory.Build.props level.

Comment threadeng/Build.ps1
}

$verifypackageshipstatusFailed = $false
if ($verifypackageshipstatus) {

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.

Related to Vlad's comment, pull this out into a separate file, something like eng/VerifyPackageShipStatus.ps1, that way it'll be easier to add as a separate build step and/or run locally.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

@vzarytovskii , we talked about this earlier, we agreed to run this when we merge into release branches. You can please take care of the yaml update for that :-)

@KevinRansom
KevinRansom enabled auto-merge (squash) August 30, 2022 01:28
@KevinRansom
KevinRansom merged commit d8a546d into dotnet:mainAug 30, 2022
KevinRansom added a commit that referenced this pull request Aug 30, 2022
* Revert tools.sh edit (#13796)
* Revert tools.sh edit
* Add binlog to build.sh for proto stuff
* Verify ship status (#13793)
* Verify ship status
* -verifypackageshipstatus in the right place
* more
* Update Versions.props
* Update azure-pipelines.yml
* reactivate test - Help is displayed correctly (#13792)
* tcconfig/tcconfigbuilder
* add --bufferwidth
* fantomas
* oops
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
@KevinRansom
KevinRansom deleted the packageshipped branch October 12, 2022 20:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@KevinRansom@vzarytovskii@brettfo
, '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

Verify ship status - #13793

Merged
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped
Aug 30, 2022
Merged

Verify ship status#13793
KevinRansom merged 7 commits into
dotnet:mainfrom
KevinRansom:packageshipped

Conversation

@KevinRansom

Copy link
Copy Markdown
Contributor

Now that the SDK build process automatically publishes FSharp.Core and FSharp.Compiler.Service, we need a mechanism to remind us to rev version numbers.

Here it is.

  • It uses an exact match packagereference to verify that the package id we think we are building hasn't been published yet.
  • It will run automatically on internal signed builds
  • not run on PR's except this one, cos I'm verifying that it works correctly in the ci environment.

It should be noted that during a build, we are not connected to nuget.org by design ... it is part of our mechanism to ensure that we don't have supply chain issues accessing public dlls.

The actual projects that we build are disconnected from the general build and set the packageroot and httpcache to a discardable location, with a random name. So ... that takes care of supply chain.

To see what it does type build -c release -verifypackageshipstatus
And observe the output this is the failing case:
image

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

Hey @brettfo , I would really appreciate, you running your eyes over this.

Thanks mate

@KevinRansomKevinRansom changed the title WIP : Do not merge : Verify ship statusVerify ship statusAug 27, 2022
@vzarytovskii

Copy link
Copy Markdown
Member

We should probably have a separate CI leg which is running on the latest release branch, @KevinRansom do you want me to take care of it? I have an idea how to deal with it.

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>

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.

These few lines shouldn't need to be here; the auto-import of Directory.Build.props should handle it and reduce the duplication.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm not a fan of putting project stuff in the Directory.Build.props and targets, it makes project files so hard to reason about.

@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />

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.

Might as well bump this import up to the Directory.Build.props level.

Comment threadeng/Build.ps1
}

$verifypackageshipstatusFailed = $false
if ($verifypackageshipstatus) {

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.

Related to Vlad's comment, pull this out into a separate file, something like eng/VerifyPackageShipStatus.ps1, that way it'll be easier to add as a separate build step and/or run locally.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@KevinRansom

Copy link
Copy Markdown
ContributorAuthor

@vzarytovskii , we talked about this earlier, we agreed to run this when we merge into release branches. You can please take care of the yaml update for that :-)

@KevinRansom
KevinRansom enabled auto-merge (squash) August 30, 2022 01:28
@KevinRansom
KevinRansom merged commit d8a546d into dotnet:mainAug 30, 2022
KevinRansom added a commit that referenced this pull request Aug 30, 2022
* Revert tools.sh edit (#13796)
* Revert tools.sh edit
* Add binlog to build.sh for proto stuff
* Verify ship status (#13793)
* Verify ship status
* -verifypackageshipstatus in the right place
* more
* Update Versions.props
* Update azure-pipelines.yml
* reactivate test - Help is displayed correctly (#13792)
* tcconfig/tcconfigbuilder
* add --bufferwidth
* fantomas
* oops
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
@KevinRansom
KevinRansom deleted the packageshipped branch October 12, 2022 20:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@KevinRansom@vzarytovskii@brettfo