From 0d5df350bf2f6cd2d8098a7971e188f205a602eb Mon Sep 17 00:00:00 2001 From: Paul Welter Date: Fri, 11 Aug 2023 11:21:05 -0500 Subject: [PATCH 1/8] update packages --- service/Directory.Build.props | 2 +- .../InstructorIQ.Core.csproj | 10 ++++-- .../Services/AssemblyMetadata.cs | 34 ------------------- .../InstructorIQ.WebApplication.csproj | 6 +++- .../Pages/Shared/_Footer.cshtml | 2 +- .../wwwroot/bundle.min.js | 10 +++--- .../wwwroot/bundle.min.js.map | 1 + 7 files changed, 20 insertions(+), 45 deletions(-) delete mode 100644 service/src/InstructorIQ.Core/Services/AssemblyMetadata.cs diff --git a/service/Directory.Build.props b/service/Directory.Build.props index 150637b6..78e36b70 100644 --- a/service/Directory.Build.props +++ b/service/Directory.Build.props @@ -18,7 +18,7 @@ - + diff --git a/service/src/InstructorIQ.Core/InstructorIQ.Core.csproj b/service/src/InstructorIQ.Core/InstructorIQ.Core.csproj index d884a278..5d667b61 100644 --- a/service/src/InstructorIQ.Core/InstructorIQ.Core.csproj +++ b/service/src/InstructorIQ.Core/InstructorIQ.Core.csproj @@ -16,18 +16,22 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + - - + + diff --git a/service/src/InstructorIQ.Core/Services/AssemblyMetadata.cs b/service/src/InstructorIQ.Core/Services/AssemblyMetadata.cs deleted file mode 100644 index ced3d6a9..00000000 --- a/service/src/InstructorIQ.Core/Services/AssemblyMetadata.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Reflection; - -namespace InstructorIQ.Core.Services; - -public static class AssemblyMetadata -{ - private static Lazy _fileVersion = new Lazy(() => - { - var assembly = typeof(AssemblyMetadata).Assembly; - var attribute = assembly.GetCustomAttribute(); - return attribute?.Version; - }); - - private static Lazy _assemblyVersion = new Lazy(() => - { - var assembly = typeof(AssemblyMetadata).Assembly; - var attribute = assembly.GetCustomAttribute(); - return attribute?.Version; - }); - - private static Lazy _informationVersion = new Lazy(() => - { - var assembly = typeof(AssemblyMetadata).Assembly; - var attribute = assembly.GetCustomAttribute(); - return attribute?.InformationalVersion; - }); - - public static string FileVersion => _fileVersion.Value; - - public static string AssemblyVersion => _assemblyVersion.Value; - - public static string InformationalVersion => _informationVersion.Value; -} diff --git a/service/src/InstructorIQ.WebApplication/InstructorIQ.WebApplication.csproj b/service/src/InstructorIQ.WebApplication/InstructorIQ.WebApplication.csproj index d43997d0..5ea12fba 100644 --- a/service/src/InstructorIQ.WebApplication/InstructorIQ.WebApplication.csproj +++ b/service/src/InstructorIQ.WebApplication/InstructorIQ.WebApplication.csproj @@ -14,13 +14,17 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + diff --git a/service/src/InstructorIQ.WebApplication/Pages/Shared/_Footer.cshtml b/service/src/InstructorIQ.WebApplication/Pages/Shared/_Footer.cshtml index 4e771aeb..5e93ee13 100644 --- a/service/src/InstructorIQ.WebApplication/Pages/Shared/_Footer.cshtml +++ b/service/src/InstructorIQ.WebApplication/Pages/Shared/_Footer.cshtml @@ -13,7 +13,7 @@ Copyright © @DateTime.Now.Year LoreSoft. All Rights Reserved.
- Version @AssemblyMetadata.FileVersion + Version @ThisAssembly.FileVersion
diff --git a/service/src/InstructorIQ.WebApplication/wwwroot/bundle.min.js b/service/src/InstructorIQ.WebApplication/wwwroot/bundle.min.js index 32fe7271..2042ebe0 100644 --- a/service/src/InstructorIQ.WebApplication/wwwroot/bundle.min.js +++ b/service/src/InstructorIQ.WebApplication/wwwroot/bundle.min.js @@ -8,7 +8,7 @@ * * Date: 2023-05-11T18:29Z */ -(function(n,t){"use strict";typeof module=="object"&&typeof module.exports=="object"?module.exports=n.document?t(n,!0):function(n){if(!n.document)throw new Error("jQuery requires a window with a document");return t(n)}:t(n)})(typeof window!="undefined"?window:this,function(n,t){"use strict";function kr(n,t,i){i=i||u;var r,e,f=i.createElement("script");if(f.text=n,t)for(r in se)e=t[r]||t.getAttribute&&t.getAttribute(r),e&&f.setAttribute(r,e);i.head.appendChild(f).parentNode.removeChild(f)}function ft(n){return n==null?n+"":typeof n=="object"||typeof n=="function"?fi[wr.call(n)]||"object":typeof n}function pi(n){var t=!!n&&"length"in n&&n.length,i=ft(n);return e(n)||ut(n)?!1:i==="array"||t===0||typeof t=="number"&&t>0&&t-1 in n}function s(n,t){return n.nodeName&&n.nodeName.toLowerCase()===t.toLowerCase()}function ve(n,t){return t?n==="\0"?"�":n.slice(0,-1)+"\\"+n.charCodeAt(n.length-1).toString(16)+" ":"\\"+n}function wi(n,t,r){return e(t)?i.grep(n,function(n,i){return!!t.call(n,i,n)!==r}):t.nodeType?i.grep(n,function(n){return n===t!==r}):typeof t!="string"?i.grep(n,function(n){return d.call(t,n)>-1!==r}):i.filter(t,n,r)}function su(n,t){while((n=n[t])&&n.nodeType!==1);return n}function ye(n){var t={};return i.each(n.match(p)||[],function(n,i){t[i]=!0}),t}function ot(n){return n}function oi(n){throw n;}function hu(n,t,i,r){var u;try{n&&e(u=n.promise)?u.call(n).done(t).fail(i):n&&e(u=n.then)?u.call(n,t,i):t.apply(undefined,[n].slice(r))}catch(n){i.apply(undefined,[n])}}function hi(){u.removeEventListener("DOMContentLoaded",hi);n.removeEventListener("load",hi);i.ready()}function be(n,t){return t.toUpperCase()}function k(n){return n.replace(pe,"ms-").replace(we,be)}function dt(){this.expando=i.expando+dt.uid++}function ge(n){return n==="true"?!0:n==="false"?!1:n==="null"?null:n===+n+""?+n:ke.test(n)?JSON.parse(n):n}function lu(n,t,i){var r;if(i===undefined&&n.nodeType===1)if(r="data-"+t.replace(de,"-$&").toLowerCase(),i=n.getAttribute(r),typeof i=="string"){try{i=ge(i)}catch(u){}c.set(n,t,i)}else i=undefined;return i}function vu(n,t,r,u){var s,h,c=20,l=u?function(){return u.cur()}:function(){return i.css(n,t,"")},o=l(),e=r&&r[3]||(i.cssNumber[t]?"":"px"),f=n.nodeType&&(i.cssNumber[t]||e!=="px"&&+o)&>.exec(i.css(n,t));if(f&&f[3]!==e){for(o=o/2,e=e||f[3],f=+o||1;c--;)i.style(n,t,f+e),(1-h)*(1-(h=l()/o||.5))<=0&&(c=0),f=f/h;f=f*2;i.style(n,t,f+e);r=r||[]}return r&&(f=+f||+o||0,s=r[1]?f+(r[1]+1)*r[2]:+r[2],u&&(u.unit=e,u.start=f,u.end=s)),s}function to(n){var r,f=n.ownerDocument,u=n.nodeName,t=bi[u];return t?t:(r=f.body.appendChild(f.createElement(u)),t=i.css(r,"display"),r.parentNode.removeChild(r),t==="none"&&(t="block"),bi[u]=t,t)}function ct(n,t){for(var e,u,f=[],i=0,o=n.length;i-1){f&&f.push(e);continue}if(w=ht(e),o=l(s.appendChild(e),"script"),w&&ki(o),r)for(a=0;e=o[a++];)pu.test(e.type||"")&&r.push(e)}return s}function lt(){return!0}function at(){return!1}function gi(n,t,r,u,f,e){var o,s;if(typeof t=="object"){typeof r!="string"&&(u=u||r,r=undefined);for(s in t)gi(n,s,r,u,t[s],e);return n}if(u==null&&f==null?(f=r,u=r=undefined):f==null&&(typeof r=="string"?(f=u,u=undefined):(f=u,u=r,r=undefined)),f===!1)f=at;else if(!f)return n;return e===1&&(o=f,f=function(n){return i().off(n),o.apply(this,arguments)},f.guid=o.guid||(o.guid=i.guid++)),n.each(function(){i.event.add(this,t,f,u,r)})}function ci(n,t,u){if(!u){r.get(n,t)===undefined&&i.event.add(n,t,lt);return}r.set(n,t,!1);i.event.add(n,t,{namespace:!1,handler:function(n){var f,u=r.get(this,t);if(n.isTrigger&1&&this[t]){if(u)(i.event.special[t]||{}).delegateType&&n.stopPropagation();else if(u=v.call(arguments),r.set(this,t,u),this[t](),f=r.get(this,t),r.set(this,t,!1),u!==f)return n.stopImmediatePropagation(),n.preventDefault(),f}else u&&(r.set(this,t,i.event.trigger(u[0],u.slice(1),this)),n.stopPropagation(),n.isImmediatePropagationStopped=lt)}})}function ku(n,t){return s(n,"table")&&s(t.nodeType!==11?t:t.firstChild,"tr")?i(n).children("tbody")[0]||n:n}function fo(n){return n.type=(n.getAttribute("type")!==null)+"/"+n.type,n}function eo(n){return(n.type||"").slice(0,5)==="true/"?n.type=n.type.slice(5):n.removeAttribute("type"),n}function du(n,t){var f,o,e,s,h,l,u;if(t.nodeType===1){if(r.hasData(n)&&(s=r.get(n),u=s.events,u)){r.remove(t,"handle events");for(e in u)for(f=0,o=u[e].length;f1&&typeof w=="string"&&!f.checkClone&&ro.test(w))return n.each(function(i){var r=n.eq(i);k&&(t[0]=w.call(this,i,r.html()));vt(r,t,u,o)});if(p&&(a=bu(t,n[0].ownerDocument,!1,n,o),b=a.firstChild,a.childNodes.length===1&&(a=b),b||o)){for(c=i.map(l(a,"script"),fo),v=c.length;h=0&&(s+=Math.max(0,Math.ceil(n["offset"+t[0].toUpperCase()+t.slice(1)]-e-s-h-.5))||0),s+c}function hf(n,t,r){var e=li(n),l=!f.boxSizingReliable()||r,o=l&&i.css(n,"boxSizing",!1,e)==="border-box",h=o,u=ii(n,t,e),c="offset"+t[0].toUpperCase()+t.slice(1);if(nr.test(u)){if(!r)return u;u="auto"}return(!f.boxSizingReliable()&&o||!f.reliableTrDimensions()&&s(n,"tr")||u==="auto"||!parseFloat(u)&&i.css(n,"display",!1,e)==="inline")&&n.getClientRects().length&&(o=i.css(n,"boxSizing",!1,e)==="border-box",h=c in n,h&&(u=n[c])),u=parseFloat(u)||0,u+rr(n,t,r||(o?"border":"content"),h,e,u)+"px"}function a(n,t,i,r,u){return new a.prototype.init(n,t,i,r,u)}function ur(){ai&&(u.hidden===!1&&n.requestAnimationFrame?n.requestAnimationFrame(ur):n.setTimeout(ur,i.fx.interval),i.fx.tick())}function af(){return n.setTimeout(function(){yt=undefined}),yt=Date.now()}function vi(n,t){var r,u=0,i={height:n};for(t=t?1:0;u<4;u+=2-t)r=nt[u],i["margin"+r]=i["padding"+r]=n;return t&&(i.opacity=i.width=n),i}function vf(n,t,i){for(var u,f=(w.tweeners[t]||[]).concat(w.tweeners["*"]),r=0,e=f.length;r=0&&tt.cacheLength&&delete n[i.shift()],n[r+" "]=u}var i=[];return n}function y(n){return n[e]=!0,n}function ut(n){var t=u.createElement("fieldset");try{return!!n(t)}catch(i){return!1}finally{t.parentNode&&t.parentNode.removeChild(t);t=null}}function er(n){return function(t){return s(t,"input")&&t.type===n}}function or(n){return function(t){return(s(t,"input")||s(t,"button"))&&t.type===n}}function ai(n){return function(t){return"form"in t?t.parentNode&&t.disabled===!1?"label"in t?"label"in t.parentNode?t.parentNode.disabled===n:t.disabled===n:t.isDisabled===n||t.isDisabled!==!n&&ur(t)===n:t.disabled===n:"label"in t?t.disabled===n:!1}}function it(n){return y(function(t){return t=+t,y(function(i,r){for(var u,f=n([],i.length,t),e=f.length;e--;)i[u=f[e]]&&(i[u]=!(r[u]=i[u]))})})}function gt(n){return n&&typeof n.getElementsByTagName!="undefined"&&n}function nt(n){var s,h=n?n.ownerDocument||n:b;return h==u||h.nodeType!==9||!h.documentElement?u:(u=h,g=u.documentElement,a=!i.isXMLDoc(u),pt=g.matches||g.webkitMatchesSelector||g.msMatchesSelector,b!=u&&(s=u.defaultView)&&s.top!==s&&s.addEventListener("unload",rr),f.getById=ut(function(n){return g.appendChild(n).id=i.expando,!u.getElementsByName||!u.getElementsByName(i.expando).length}),f.disconnectedMatch=ut(function(n){return pt.call(n,"*")}),f.scope=ut(function(){return u.querySelectorAll(":scope")}),f.cssHas=ut(function(){try{return u.querySelector(":has(*,:jqfake)"),!1}catch(n){return!0}}),f.getById?(t.filter.ID=function(n){var t=n.replace(w,k);return function(n){return n.getAttribute("id")===t}},t.find.ID=function(n,t){if(typeof t.getElementById!="undefined"&&a){var i=t.getElementById(n);return i?[i]:[]}}):(t.filter.ID=function(n){var t=n.replace(w,k);return function(n){var i=typeof n.getAttributeNode!="undefined"&&n.getAttributeNode("id");return i&&i.value===t}},t.find.ID=function(n,t){if(typeof t.getElementById!="undefined"&&a){var i,u,f,r=t.getElementById(n);if(r){if(i=r.getAttributeNode("id"),i&&i.value===n)return[r];for(f=t.getElementsByName(n),u=0;r=f[u++];)if(i=r.getAttributeNode("id"),i&&i.value===n)return[r]}return[]}}),t.find.TAG=function(n,t){return typeof t.getElementsByTagName!="undefined"?t.getElementsByTagName(n):t.querySelectorAll(n)},t.find.CLASS=function(n,t){if(typeof t.getElementsByClassName!="undefined"&&a)return t.getElementsByClassName(n)},c=[],ut(function(n){var t;g.appendChild(n).innerHTML="<\/a>