Skip to content

Commit 7db7834

Browse files
Merge branch 'master' into DYN-9958-WebView2-CacheFolder-Temp
2 parents 9ba365d + c70e506 commit 7db7834

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"projects": ["src", "test"],
33
"sdk": {
44
"version": "10.0.100",
5-
"rollForward": "disable"
5+
"rollForward": "patch"
66
}
77
}

src/DynamoCoreWpf/Controls/StartPage.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,9 @@ internal void WalkDirectoryTree(System.IO.DirectoryInfo root, SampleFileEntry ro
226226
{
227227
foreach (System.IO.DirectoryInfo directory in directories)
228228
{
229-
//Make sure the folder's name is not "backup"
230-
if (!directory.Name.Equals(Configurations.BackupFolderName))
229+
//Make sure the folder's name is not "backup" and not "GD"
230+
if (!directory.Name.Equals(Configurations.BackupFolderName) &&
231+
!directory.Name.Equals("GD", StringComparison.OrdinalIgnoreCase))
231232
{
232233
// Recursive call for each subdirectory.
233234
SampleFileEntry sampleFileEntry =

test/Libraries/DynamoPythonTests/PythonTestsWithLogging.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public void DynamoPrintLogsToConsole()
4747
}
4848

4949
[Test]
50+
[Category("Failure")]
5051
public void ResetCypythonLogsToConsoleAfterRun()
5152
{
5253
(CurrentDynamoModel.CurrentWorkspace as HomeWorkspaceModel).RunSettings.RunType = RunType.Manual;

0 commit comments

Comments
 (0)