ADP in RC2.6.1 (#10692)

* Update latest analytics (#10691)

* add instrumentation file back and update latest analytics dlls

* update latest adp consent wording

* update file vers for analytics

* fix hostname (#10693)

Co-authored-by: Tibi <[email protected]>

doc/distrib/ADPAnalyticsConsent.rtf

@@ -39,15 +39,15 @@
 \ltrch\fcs0 \b\fs32\cf19\lang1033\langfe1033\kerning32\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink15 \sqformat \spriority9 \styrsid7559448 heading 1;}{
 \s2\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel1\rin0\lin0\itap0 \rtlch\fcs1 \ab\ai\af0\afs28\alang1025 \ltrch\fcs0 \b\i\fs28\cf19\lang1033\langfe1033\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 
 \sbasedon0 \snext0 \slink16 \sqformat \spriority9 \styrsid7559448 heading 2;}{\s3\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel2\rin0\lin0\itap0 \rtlch\fcs1 \ab\af0\afs26\alang1025 \ltrch\fcs0 
-\b\fs26\cf19\lang1033\langfe1033\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink17 \sqformat \spriority9 \styrsid7559448 heading 3;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 
-Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
-\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af37\afs22\alang1025 \ltrch\fcs0 \f37\fs22\cf19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused 
-Normal Table;}{\*\cs15 \additive \rtlch\fcs1 \ab\af0\afs32 \ltrch\fcs0 \b\fs32\kerning32\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink1 \slocked \spriority9 \styrsid7559448 Heading 1 Char;}{\*\cs16 \additive \rtlch\fcs1 \ab\ai\af0\afs28 
-\ltrch\fcs0 \b\i\fs28\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink2 \slocked \spriority9 \styrsid7559448 Heading 2 Char;}{\*\cs17 \additive \rtlch\fcs1 \ab\af0\afs26 \ltrch\fcs0 \b\fs26\loch\f31502\hich\af31502\dbch\af31501 
-\sbasedon10 \slink3 \slocked \spriority9 \styrsid7559448 Heading 3 Char;}}{\*\rsidtbl \rsid483671\rsid3037294\rsid5012088\rsid5136836\rsid5378609\rsid6827092\rsid7174336\rsid7559448\rsid9534305\rsid10551617\rsid12388035\rsid14811469\rsid14831659
-\rsid15021189\rsid15617602}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Limiardi Sancerio}{\operator Tiberiu Pinzariu}{\creatim\yr2015\mo5\dy4\hr12\min55}
-{\revtim\yr2020\mo5\dy18\hr13\min30}{\version12}{\edmins9}{\nofpages1}{\nofwords77}{\nofchars444}{\*\company Autodesk, Inc.}{\nofcharsws520}{\vern111}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
-\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
+\b\fs26\cf19\lang1033\langfe1033\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink17 \sqformat \spriority9 \styrsid7559448 heading 3;}{\*\cs10 \additive \sunhideused \spriority1 Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af37\afs22\alang1025 \ltrch\fcs0 \f37\fs22\cf19\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused Normal Table;}{\*\cs15 \additive 
+\rtlch\fcs1 \ab\af0\afs32 \ltrch\fcs0 \b\fs32\kerning32\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink1 \slocked \spriority9 \styrsid7559448 Heading 1 Char;}{\*\cs16 \additive \rtlch\fcs1 \ab\ai\af0\afs28 \ltrch\fcs0 
+\b\i\fs28\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink2 \slocked \spriority9 \styrsid7559448 Heading 2 Char;}{\*\cs17 \additive \rtlch\fcs1 \ab\af0\afs26 \ltrch\fcs0 \b\fs26\loch\f31502\hich\af31502\dbch\af31501 
+\sbasedon10 \slink3 \slocked \spriority9 \styrsid7559448 Heading 3 Char;}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid483671\rsid3037294\rsid5012088\rsid5136836\rsid5378609\rsid6827092\rsid7174336
+\rsid7559448\rsid9534305\rsid10551617\rsid12388035\rsid14363366\rsid14811469\rsid14831659\rsid15021189\rsid15617602}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info
+{\author Limiardi Sancerio}{\operator Tiberiu Pinzariu}{\creatim\yr2015\mo5\dy4\hr12\min55}{\revtim\yr2020\mo5\dy21\hr8\min35}{\version13}{\edmins10}{\nofpages1}{\nofwords75}{\nofchars428}{\*\company Autodesk, Inc.}{\nofcharsws502}{\vern111}}
+{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
 \widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1\noxlattoyen
 \expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin500\dgvorigin0\dghshow1\dgvshow1
 \jexpand\viewkind5\viewscale90\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
@@ -60,12 +60,12 @@ Normal Table;}{\*\cs15 \additive \rtlch\fcs1 \ab\af0\afs32 \ltrch\fcs0 \b\fs32\k
 \b\fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid5378609 \hich\af40\dbch\af11\loch\f40 A}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \b\fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid14811469 
 \hich\af40\dbch\af11\loch\f40 utodesk}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \b\fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid15021189\charrsid15021189 \hich\af40\dbch\af11\loch\f40  Analytics]}{\rtlch\fcs1 \af0\afs20 
 \ltrch\fcs0 \b\fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid15021189 
-\par }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \b\fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid15021189\charrsid15021189 
-\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid483671 {\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid5136836\charrsid483671 
-\hich\af40\dbch\af11\loch\f40 
-Autodesk analytics programs help us understand how our customers use our products and services so we can personalize your experience and build better online, mobile, and desktop applications.  By analyzing usage trends and patterns we can optimize current
-\hich\af40\dbch\af11\loch\f40  \hich\af40\dbch\af11\loch\f40 features, make positive changes for future releases, provide more useful communications, and improve performance and quality.
-\par }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid15617602\charrsid483671 
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid14363366 {\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid14363366 
+\par }{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid14363366\charrsid14363366 \hich\af40\dbch\af11\loch\f40 Autodesk analytics programs help us (Autodesk) understand your use of Dynamo so
+\hich\af40\dbch\af11\loch\f40  we can personalize your experience and build better online, mobile, and desktop applications.\~
+ By analyzing usage trends and patterns we can optimize current features, make positive changes for future releases, provide more useful communications, and imp\hich\af40\dbch\af11\loch\f40 r\hich\af40\dbch\af11\loch\f40 ove performance and quality.
+
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid483671 {\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid15617602\charrsid483671 
 \par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid5136836 {\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid5136836\charrsid483671 
 \hich\af40\dbch\af11\loch\f40 You may opt out of data collection in desktop products for Autodesk analytics programs by unchecking the box below.}{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 
 \fs20\cf20\lang1033\langfe1041\loch\af40\hich\af40\dbch\af11\langfenp1041\insrsid7174336\charrsid3037294 
@@ -188,8 +188,8 @@ fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000d0e6
-de073a2dd601feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000020f1
+5b606c2fd601feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000105000000000000}}

src/DynamoCore/DynamoCore.csproj

@@ -403,6 +403,7 @@ limitations under the License.
     <Copy SourceFiles="$(SolutionDir)..\doc\distrib\License.rtf" DestinationFolder="$(OutputPath)" />
     <Copy SourceFiles="$(SolutionDir)..\doc\distrib\TermsOfUse.rtf" DestinationFolder="$(OutputPath)" />
     <Copy SourceFiles="$(SolutionDir)..\doc\distrib\GoogleAnalyticsConsent.rtf" DestinationFolder="$(OutputPath)" />
+    <Copy SourceFiles="$(SolutionDir)..\doc\distrib\InstrumentationConsent.rtf" DestinationFolder="$(OutputPath)" />
     <Copy SourceFiles="$(SolutionDir)..\doc\distrib\ADPAnalyticsConsent.rtf" DestinationFolder="$(OutputPath)" />
     <Copy SourceFiles="@(ExternProtoGeometry)" DestinationFolder="$(OutputPath)" />
     <Copy SourceFiles="@(ExternProtoGeometryXml)" DestinationFolder="$(OutputPath)\$(UICulture)" />

src/DynamoCore/Logging/DynamoAnalyticsClient.cs

@@ -175,7 +175,8 @@ public DynamoAnalyticsClient(DynamoModel dynamoModel)
 
             //Dynamo app version.
             var appversion = dynamoModel.AppVersion;
-            var hostName = dynamoModel?.HostName ?? "Dynamo";
+
+            var hostName = string.IsNullOrEmpty(dynamoModel.HostName) ? "Dynamo" : dynamoModel.HostName;
 
             string buildId = "", releaseId = "";
             Version version;

src/DynamoCore/Models/DynamoModel.cs

@@ -596,6 +596,21 @@ protected DynamoModel(IStartConfiguration config)
                 PreferenceSettings.PropertyChanged += PreferenceSettings_PropertyChanged;
             }
 
+            UpdateManager = config.UpdateManager ?? new DefaultUpdateManager(null);
+
+            var hostUpdateManager = config.UpdateManager;
+
+            if (hostUpdateManager != null)
+            {
+                HostName = hostUpdateManager.HostName;
+                HostVersion = hostUpdateManager.HostVersion == null ? null : hostUpdateManager.HostVersion.ToString();
+            }
+            else
+            {
+                HostName = string.Empty;
+                HostVersion = null;
+            }
+
             bool areAnalyticsDisabledFromConfig = false;
             try
             {
@@ -766,21 +781,6 @@ protected DynamoModel(IStartConfiguration config)
 
             AuthenticationManager = new AuthenticationManager(config.AuthProvider);
 
-            UpdateManager = config.UpdateManager ?? new DefaultUpdateManager(null);
-
-            var hostUpdateManager = config.UpdateManager;
-
-            if (hostUpdateManager != null)
-            {
-                HostName = hostUpdateManager.HostName;
-                HostVersion = hostUpdateManager.HostVersion == null ? null : hostUpdateManager.HostVersion.ToString();
-            }
-            else
-            {
-                HostName = string.Empty;
-                HostVersion = null;
-            }
-
             UpdateManager.Log += UpdateManager_Log;
             if (!IsTestMode && !IsHeadless)
             {