Skip to content
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

DYN-7394 Bump up version on master branch #15595

Merged
merged 1 commit into from
Nov 5, 2024
Merged

DYN-7394 Bump up version on master branch #15595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@DYNAMO v.3.4.0 © 2024 Autodesk, Inc. All rights reserved.
@DYNAMO v.3.5.0 © 2024 Autodesk, Inc. All rights reserved.
Dynamo License

Those portions created by Ian are provided with the following copyright:
Expand Down
4 changes: 2 additions & 2 deletions doc/distrib/License.rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{\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;}}
{\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;}
{\stylesheet{ Normal;}{\s1 heading 1;}{\s2 heading 2;}{\s3 heading 3;}{\s4 heading 4;}}
{\*\generator Riched20 10.0.22621}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\nowidctlpar\sb240\sl276\slmult1\cf1\b\f0\fs22\lang2057 @DYNAMO v.3.4.0 \'a9 2024 Autodesk, Inc. All rights reserved.\par
{\*\generator Riched20 10.0.22621}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\nowidctlpar\sb240\sl276\slmult1\cf1\b\f0\fs22\lang2057 @DYNAMO v.3.5.0 \'a9 2024 Autodesk, Inc. All rights reserved.\par
Dynamo License\par

\pard\widctlpar\b0\par
Expand Down
6 changes: 3 additions & 3 deletions src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// associated with an assembly.
[assembly: AssemblyCompany("Autodesk, Inc")]
[assembly: AssemblyProduct("Dynamo")]
[assembly: AssemblyCopyright("Copyright � Autodesk, Inc 2024")]
[assembly: AssemblyCopyright("Copyright © Autodesk, Inc 2024")]
[assembly: AssemblyTrademark("")]

//In order to begin building localizable applications, set
Expand Down Expand Up @@ -45,7 +45,7 @@
// to distinguish one build from another. AssemblyFileVersion is specified
// in AssemblyVersionInfo.cs so that it can be easily incremented by the
// automated build process.
[assembly: AssemblyVersion("3.4.0.6124")]
[assembly: AssemblyVersion("3.5.0.6740")]


// By default, the "Product version" shown in the file properties window is
Expand All @@ -64,4 +64,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("3.4.0.6124")]
[assembly: AssemblyFileVersion("3.5.0.6740")]
2 changes: 1 addition & 1 deletion src/AssemblySharedInfoGenerator/AssemblySharedInfo.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyFileVersion("<#= this.MajorVersion #>.<#= this.MinorVersion #>.<#= this.BuildNumber #>.<#= this.RevisionNumber #>")]
<#+
int MajorVersion = 3;
int MinorVersion = 4;
int MinorVersion = 5;
int BuildNumber = 0;
// The datetime baseline we choose using this algorithm will affect build number and all nuget packages uploaded
// Please only change when major or minor version got incremented
Expand Down
4 changes: 2 additions & 2 deletions src/Config/upiconfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<upi_attribute name='id' value='DYN'/>
<upi_element name='level'>
<upi_attribute name='name' value='release'/>
<upi_attribute name='id' value='3.4.0'/>
<upi_attribute name='id' value='3.5.0'/>
<upi_element name='level'>
<upi_attribute name='name' value='master'/>
<upi_attribute name='id' value='Win64'/>
<upi_element name='level'>
<upi_attribute name='name' value='build'/>
<upi_attribute name='id' value='3.4.0' />
<upi_attribute name='id' value='3.5.0' />
</upi_element>
</upi_element>
</upi_element>
Expand Down
4 changes: 2 additions & 2 deletions test/DynamoCoreWpfTests/PreferencesViewModelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ public void PathManagerWithDifferentHostTest()
string dynamoRevitHostPath = "C:\\Program Files\\Autodesk\\Revit 2024\\AddIns\\DynamoForRevit\\Revit)";
singletonPathManager.AssignHostPathAndIPathResolver(dynamoRevitHostPath, revitPathResolver);

string dynamoRevitUserDataDirectory = Path.Combine(revitResolverParams.UserDataRootFolder, "3.4");
string dynamoRevitCommonDataDirectory = Path.Combine(revitResolverParams.CommonDataRootFolder, "3.4");
string dynamoRevitUserDataDirectory = Path.Combine(revitResolverParams.UserDataRootFolder, "3.5");
string dynamoRevitCommonDataDirectory = Path.Combine(revitResolverParams.CommonDataRootFolder, "3.5");
string dynamoRevitSamplesPath = Path.Combine(revitResolverParams.CommonDataRootFolder, "samples\\en-US");
string dynamoRevitTemplatesPath = Path.Combine(revitResolverParams.CommonDataRootFolder, "templates\\en-US");

Expand Down
6 changes: 3 additions & 3 deletions tools/autobuild/build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"product_id": "DYN",
"release_id": "3.4.0",
"release_id": "3.5.0",
"master_id": "Win64",
"build_id": "3.4.0",
"name": "3.4.0",
"build_id": "3.5.0",
"name": "3.5.0",
"build_milestone": "FCS",
"description":"Build"
}
6 changes: 3 additions & 3 deletions tools/autobuild/master.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"product_id": "DYN",
"release_id": "3.4.0",
"name": "DynamoCore3.4.0 Win64",
"release_id": "3.5.0",
"name": "DynamoCore3.5.0 Win64",
"master_id": "Win64",
"language_pk": 1,
"language_code_pk": 3,
"master_platform_pk": 2,
"master_type_pk": 1,
"description":"DynamoCore3.4.0"
"description":"DynamoCore3.5.0"
}
10 changes: 5 additions & 5 deletions tools/autobuild/release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"product_id": "DYN",
"release_id": "3.4.0",
"name": "DynamoCore3.4.0",
"marketing_release_name": "DynamoCore3.4.0",
"description":"DynamoCore3.4.0",
"code_name": "DynamoCore3.4.0"
"release_id": "3.5.0",
"name": "DynamoCore3.5.0",
"marketing_release_name": "DynamoCore3.5.0",
"description":"DynamoCore3.5.0",
"code_name": "DynamoCore3.5.0"
}
Loading