Skip to content

Commit 3ae1373

Browse files
zeusongitpinzart90
andauthored
8268: [DYN-8278] Cherry-pick and version bump for 3.4.2: Fix noNetworkMode for PM client (#15819)
Co-authored-by: pinzart90 <[email protected]>
1 parent a9a1167 commit 3ae1373

File tree

7 files changed

+21
-15
lines changed

7 files changed

+21
-15
lines changed

LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@DYNAMO v.3.4.1 © 2024 Autodesk, Inc. All rights reserved.
1+
@DYNAMO v.3.4.2 © 2025 Autodesk, Inc. All rights reserved.
22
Dynamo License
33

44
Those portions created by Ian are provided with the following copyright:
@@ -7,7 +7,7 @@ Copyright 2017 Ian Keough
77

88
Those portions created by Autodesk employees are provided with the following copyright:
99

10-
Copyright 2022 Autodesk, Inc.
10+
Copyright 2025 Autodesk, Inc.
1111

1212
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
1313

doc/distrib/License.rtf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe2052{\fonttbl{\f0\fswiss\fprq2\fcharset0 Helvetica;}{\f1\fswiss\fprq2\fcharset0 Verdana;}{\f2\froman\fprq2\fcharset0 Times New Roman;}}
22
{\colortbl ;\red165\green165\blue165;\red109\green210\blue255;\red0\green0\blue255;\red70\green70\blue70;\red255\green255\blue255;\red74\green74\blue74;\red5\green99\blue193;\red36\green41\blue47;}
33
{\stylesheet{ Normal;}{\s1 heading 1;}{\s2 heading 2;}{\s3 heading 3;}{\s4 heading 4;}}
4-
{\*\generator Riched20 10.0.22621}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
5-
\pard\nowidctlpar\sb240\sl276\slmult1\cf1\b\f0\fs22\lang2057 @DYNAMO v.3.4.1 \'a9 2024 Autodesk, Inc. All rights reserved.\par
4+
{\*\generator Riched20 10.0.22000}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
5+
\pard\nowidctlpar\sb240\sl276\slmult1\cf1\b\f0\fs22\lang2057 @DYNAMO v.3.4.2 \'a9 2025 Autodesk, Inc. All rights reserved.\par
66
Dynamo License\par
77
88
\pard\widctlpar\b0\par
@@ -12,7 +12,7 @@ Copyright 2017 Ian Keough\par
1212
\par
1313
Those portions created by Autodesk employees are provided with the following copyright:\par
1414
\par
15-
Copyright 2024 Autodesk, Inc.\par
15+
Copyright 2025 Autodesk, Inc.\par
1616
\par
1717
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at {\cf2\ul{\field{\*\fldinst{HYPERLINK "https://nam11.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.apache.org%2Flicenses%2FLICENSE-2.0&data=04%7C01%7CJames.Conner%40autodesk.com%7Cdaecd65781944b855e7808d946251ff6%7C67bff79e7f914433a8e5c9252d2ddc1d%7C0%7C0%7C637617947520120511%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=hM4SECRXlI3Y3bhWd0n7aVFES8pYfE3tfdiIfbSsdIo%3D&reserved=0" }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0}}}}\cf2\ul\f0\fs22 \cf1\ulnone Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.\cf2\ul\par
1818
\cf0\ulnone\b\f1\fs20\par

src/AssemblySharedInfoGenerator/AssemblySharedInfo.tt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
99
// associated with an assembly.
1010
[assembly: AssemblyCompany("Autodesk, Inc")]
1111
[assembly: AssemblyProduct("Dynamo")]
12-
[assembly: AssemblyCopyright("Copyright © Autodesk, Inc 2024")]
12+
[assembly: AssemblyCopyright("Copyright © Autodesk, Inc 2025")]
1313
[assembly: AssemblyTrademark("")]
1414

1515
//In order to begin building localizable applications, set
@@ -69,7 +69,7 @@ using System.Runtime.InteropServices;
6969
<#+
7070
int MajorVersion = 3;
7171
int MinorVersion = 4;
72-
int BuildNumber = 1;
72+
int BuildNumber = 2;
7373
// The datetime baseline we choose using this algorithm will affect build number and all nuget packages uploaded
7474
// Please only change when major or minor version got incremented
7575
int RevisionNumber = ((int)(DateTime.UtcNow - new DateTime(2023,1,1)).TotalDays)*10+((int)DateTime.UtcNow.Hour)/3;

src/Config/upiconfig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<upi_attribute name='id' value='Win64'/>
1515
<upi_element name='level'>
1616
<upi_attribute name='name' value='build'/>
17-
<upi_attribute name='id' value='3.4.1' />
17+
<upi_attribute name='id' value='3.4.2' />
1818
</upi_element>
1919
</upi_element>
2020
</upi_element>

src/DynamoPackages/PackageManagerClient.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ internal PackageManagerClient(IGregClient client, IPackageUploadBuilder builder,
5757
this.uploadBuilder = builder;
5858
this.client = client;
5959
this.packageMaintainers = new Dictionary<string, bool>();
60-
61-
this.LoadCompatibilityMap(); // Load the compatibility map
6260
}
6361

6462
internal bool Upvote(string packageId)
@@ -370,7 +368,7 @@ internal static Dictionary<string, Dictionary<string, string>> GetCompatibilityM
370368
/// <summary>
371369
/// Method to load the map once, making it accessible to all elements
372370
/// </summary>
373-
private void LoadCompatibilityMap()
371+
internal void LoadCompatibilityMap()
374372
{
375373
if (compatibilityMap == null) // Load only if not already loaded
376374
{

src/DynamoPackages/PackageManagerExtension.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,16 @@ public void Startup(StartupParams startupParams)
161161
new GregClient(startupParams.AuthProvider, url),
162162
uploadBuilder, packageUploadDirectory);
163163

164-
LoadPackages(startupParams.Preferences, startupParams.PathManager);
165164
noNetworkMode = startupParams.NoNetworkMode;
165+
166+
//we don't ask dpm for the compatibility map in offline mode.
167+
if (!noNetworkMode)
168+
{
169+
// Load the compatibility map
170+
PackageManagerClient.LoadCompatibilityMap();
171+
}
172+
173+
LoadPackages(startupParams.Preferences, startupParams.PathManager);
166174
}
167175

168176
/// <summary>

tools/autobuild/build.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"product_id": "DYN",
33
"release_id": "3.4.0",
44
"master_id": "Win64",
5-
"build_id": "3.4.1",
6-
"name": "3.4.1",
7-
"build_milestone": "Update 1",
5+
"build_id": "3.4.2",
6+
"name": "3.4.2",
7+
"build_milestone": "Update 2",
88
"description":"Build"
99
}

0 commit comments

Comments
 (0)