Skip to content

Commit

Permalink
Thunderdome 2022.1 - Added support for search groups. Minor update in…
Browse files Browse the repository at this point in the history
… Tools->Thunderdome PullOutMenu
  • Loading branch information
koechlm committed Dec 2, 2021
1 parent fcbde54 commit 61f0160
Show file tree
Hide file tree
Showing 15 changed files with 74 additions and 54 deletions.
2 changes: 1 addition & 1 deletion Deploy/Deploy.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Autodesk.Connectivity.WebServices">
<HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.WebServices.dll</HintPath>
<HintPath>..\..\..\..\OneDrive - Autodesk\Vault Customization\SDK References 2022\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.WebServices.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand Down
6 changes: 3 additions & 3 deletions Deploy/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("Thunderdome Deploy 2022")]
[assembly: AssemblyTitle("Thunderdome Deploy 2022.1")]
[assembly: AssemblyDescription("Deploy managed user settings and extensions")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Autodesk")]
Expand All @@ -17,5 +17,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("C716965C-8440-4490-A9D8-1A4C2C35D056")]

[assembly: AssemblyVersion("27.0.0.1")]
[assembly: AssemblyFileVersion("27.0.0.1")]
[assembly: AssemblyVersion("2022.27.1.0")]
[assembly: AssemblyFileVersion("2022.27.1.0")]
14 changes: 14 additions & 0 deletions Thunderdome/DeploymentController/SavedSearchesController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ namespace Thunderdome.DeploymentController
public class SavedSearchesController : DeploymentContainerController
{
private const string FolderSearches = "Searches";
private const string SearchesGroups = "Groups";

public SavedSearchesController(Connection connection, string vaultName)
: base(connection, vaultName, "Autodesk.SavedSearch")
Expand All @@ -23,11 +24,24 @@ public override DeploymentContainer DetectItems()
string serverName = AutodeskPathUtil.GetServerSettingsFolderName(Connection);
string localSettingFolder = AutodeskPathUtil.GetCurrentVaultCommonFolder(Connection, serverName, VaultName);
string searchesPath = Path.Combine(localSettingFolder, FolderSearches);
//Vault 2022 (2021.2) added grouping of searches; the groups/searches are stored in the .\Groups\Groups.xml file
//add the groups as first item in the tree
string grpname = string.Format(ExtensionRes.SavedSearchesController_SavedSearchesGroups);
foreach (string folder in DirectoryUtil.GetDirectoriesOrEmpty(searchesPath))
{
string folderName = Path.GetFileName(folder);
if (folderName.Equals(SearchesGroups, StringComparison.InvariantCultureIgnoreCase))
{
container.DeploymentItems.Add(new DeploymentFolder(folder, ExtensionRes.SavedSearchesController_SavedSearchesGroups));
}
}
//add the saved searches
foreach (string searchPath in DirectoryUtil.GetFilesOrEmpty(searchesPath))
{
string name = string.Format(ExtensionRes.SavedSearchesController_SavedSearch_0, Path.GetFileName(searchPath));
container.DeploymentItems.Add(new DeploymentFile(searchPath, name));
}

return container;
}
catch
Expand Down
11 changes: 10 additions & 1 deletion Thunderdome/ExtensionRes.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Thunderdome/ExtensionRes.de.resx
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
<value>Verteilung konnte nicht installiert werden: {0}</value>
</data>
<data name="ThunderdomeExplorerExtension_DeployCommand" xml:space="preserve">
<value>Verteilung</value>
<value>Verteilung...</value>
</data>
<data name="ThunderdomeExplorerExtension_DisplayResultMessage_ExitRequired" xml:space="preserve">
<value>Vault Client beenden!</value>
Expand Down Expand Up @@ -287,4 +287,7 @@ Der Vault Client wird nach der Aktualisierung automatisch gestartet.</value>
<data name="DataStandardController_HelpFiles" xml:space="preserve">
<value>HelpFiles</value>
</data>
<data name="SavedSearchesController_SavedSearchesGroups" xml:space="preserve">
<value>Suchgruppen</value>
</data>
</root>
5 changes: 4 additions & 1 deletion Thunderdome/ExtensionRes.resx
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ The Vault Client will restart when the update is complete.</value>
<value>Unable to apply the deployment: {0}</value>
</data>
<data name="ThunderdomeExplorerExtension_DeployCommand" xml:space="preserve">
<value>Deploy</value>
<value>Deploy...</value>
</data>
<data name="ThunderdomeExplorerExtension_ConfigureThunderdome_DeploymentNameUsed" xml:space="preserve">
<value>The name '{0}' is already used.</value>
Expand Down Expand Up @@ -306,4 +306,7 @@ The Vault Client will restart when the update is complete.</value>
<data name="_000440_folder_search" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\000440-folder-search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SavedSearchesController_SavedSearchesGroups" xml:space="preserve">
<value>Search Groups</value>
</data>
</root>
16 changes: 0 additions & 16 deletions Thunderdome/Localizer.cs

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Thunderdome/Configure.cs → Thunderdome/ManageDeployments.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Thunderdome
/// <summary>
/// Deployment configuration form
/// </summary>
public partial class Configure : Form
public partial class ManageDeployments : Form
{
private Connection _conn;
private bool _isInitializing;
Expand Down Expand Up @@ -52,7 +52,7 @@ public List<ConfigurationResult> ConfigurationResults
/// <param name="deployments">Selected configuration items to be deployed</param>
/// <param name="vaultName">Vault name to deploy package</param>
/// <param name="conn">Vault connection</param>
public Configure()
public ManageDeployments()
{

InitializeComponent();
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions Thunderdome/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("Thunderdome 2022")]
[assembly: AssemblyTitle("Thunderdome 2022.1")]
[assembly: AssemblyDescription("Manage and deploy user settings and extensions")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Autodesk")]
Expand All @@ -19,5 +19,5 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("129EBB30-24B6-4635-AE20-46BF10EF3B12")]

[assembly: AssemblyVersion("27.0.0.2")]
[assembly: AssemblyFileVersion("27.0.0.2")]
[assembly: AssemblyVersion("2022.27.1.0")]
[assembly: AssemblyFileVersion("2022.27.1.0")]
31 changes: 18 additions & 13 deletions Thunderdome/Thunderdome.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,27 +69,31 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Autodesk.Connectivity.Explorer.Extensibility">
<HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.Explorer.Extensibility.dll</HintPath>
<HintPath>..\..\..\..\OneDrive - Autodesk\Vault Customization\SDK References 2022\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.Explorer.Extensibility.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Autodesk.Connectivity.Explorer.ExtensibilityTools">
<HintPath>..\..\..\..\OneDrive - Autodesk\Vault Customization\SDK References 2022\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.Explorer.ExtensibilityTools.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Autodesk.Connectivity.Extensibility.Framework">
<HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.Extensibility.Framework.dll</HintPath>
<HintPath>..\..\..\..\OneDrive - Autodesk\Vault Customization\SDK References 2022\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.Extensibility.Framework.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Autodesk.Connectivity.JobProcessor.Extensibility">
<HintPath>..\..\..\OneDrive - autodesk\Vault Customization\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.JobProcessor.Extensibility.dll</HintPath>
<HintPath>..\..\..\..\OneDrive - Autodesk\Vault Customization\SDK References 2022\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.JobProcessor.Extensibility.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Autodesk.Connectivity.WebServices">
<HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.WebServices.dll</HintPath>
<HintPath>..\..\..\..\OneDrive - Autodesk\Vault Customization\SDK References 2022\Autodesk Vault 2022 SDK\bin\x64\Autodesk.Connectivity.WebServices.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Autodesk.DataManagement.Client.Framework">
<HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk Vault 2022 SDK\bin\x64\Autodesk.DataManagement.Client.Framework.dll</HintPath>
<HintPath>..\..\..\..\OneDrive - Autodesk\Vault Customization\SDK References 2022\Autodesk Vault 2022 SDK\bin\x64\Autodesk.DataManagement.Client.Framework.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Autodesk.DataManagement.Client.Framework.Vault">
<HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk Vault 2022 SDK\bin\x64\Autodesk.DataManagement.Client.Framework.Vault.dll</HintPath>
<HintPath>..\..\..\..\OneDrive - Autodesk\Vault Customization\SDK References 2022\Autodesk Vault 2022 SDK\bin\x64\Autodesk.DataManagement.Client.Framework.Vault.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
Expand Down Expand Up @@ -176,11 +180,11 @@
</Compile>
<Compile Include="Settings.cs" />
<Compile Include="ThunderdomeExplorerExtension.cs" />
<Compile Include="Configure.cs">
<Compile Include="ManageDeployments.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Configure.Designer.cs">
<DependentUpon>Configure.cs</DependentUpon>
<Compile Include="ManageDeployments.Designer.cs">
<DependentUpon>ManageDeployments.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Util\ArrayUtil.cs" />
Expand All @@ -205,12 +209,12 @@
<DependentUpon>AskDialog.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Configure.de.resx">
<DependentUpon>Configure.cs</DependentUpon>
<EmbeddedResource Include="ManageDeployments.de.resx">
<DependentUpon>ManageDeployments.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Configure.resx">
<DependentUpon>Configure.cs</DependentUpon>
<EmbeddedResource Include="ManageDeployments.resx">
<DependentUpon>ManageDeployments.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Deploy.de.resx">
Expand All @@ -224,6 +228,7 @@
<EmbeddedResource Include="ExtensionRes.de.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>ExtensionRes.de.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ExtensionRes.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand Down
22 changes: 11 additions & 11 deletions Thunderdome/ThunderdomeExplorerExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,6 @@ public IEnumerable<CommandSite> CommandSites()
backupCmd.Execute += BackupCmd_Execute;
site.AddCommand(backupCmd);

CommandItem configCmd = new CommandItem(ThunderdomeConfigCommandId, ExtensionRes.ThunderdomeExplorerExtension_ConfigureationCommand)
{
Description = ExtensionRes.ThunderdomeExplorerExtension_CommandSites_ConfigureationCommandDescription,
Hint = ExtensionRes.ThunderdomeExplorerExtension_ConfigureationCommand,
Image = ExtensionRes._000276_computer_settings,
ToolbarPaintStyle = PaintStyle.TextAndGlyph
};
configCmd.Execute += ConfigCmd_Execute;
site.AddCommand(configCmd);

CommandItem deployCmd = new CommandItem(ThunderdomeDeployCommandId, ExtensionRes.ThunderdomeExplorerExtension_DeployCommand)
{
Description = ExtensionRes.ThunderdomeExplorerExtension_CommandSites_DeployCommandDescription,
Expand All @@ -104,6 +94,16 @@ public IEnumerable<CommandSite> CommandSites()
deployCmd.Execute += DeployCmd_Execute;
site.AddCommand(deployCmd);

CommandItem configCmd = new CommandItem(ThunderdomeConfigCommandId, ExtensionRes.ThunderdomeExplorerExtension_ConfigureationCommand)
{
Description = ExtensionRes.ThunderdomeExplorerExtension_CommandSites_ConfigureationCommandDescription,
Hint = ExtensionRes.ThunderdomeExplorerExtension_ConfigureationCommand,
Image = ExtensionRes._000276_computer_settings,
ToolbarPaintStyle = PaintStyle.TextAndGlyph
};
configCmd.Execute += ConfigCmd_Execute;
site.AddCommand(configCmd);

return new CommandSite[] { site };
}

Expand Down Expand Up @@ -535,7 +535,7 @@ private async Task ConfigureThunderdome(ICommandContext context)

DeploymentSet initialDeploymentModel = LoadSavedDeployments(conn);

Configure cfgDialog = new Configure();
ManageDeployments cfgDialog = new ManageDeployments();
if (await cfgDialog.ShowDialog(initialDeploymentModel, vaultName, conn) != DialogResult.OK)
{
VaultFoldersController.CleanUpTmpRootFolder();
Expand Down
2 changes: 2 additions & 0 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ Thunderdome is open source. You are expected to build your individual applicatio

RELEASE NOTES:
---------------------------------
2022.1: Support for Saved Searches Groups added; Minor updates on the Tools->Thunderdome Pullout-Menu

2022.0.0 - Next Generation of Thunderdome:
Autodesk Consulting contributed many customer project driven enhancements, like Client language support de-XX, managing multiple deployments and user defined addition of folders to be deployed to Vault Workspace locations or any other target. This version is available as open source and installable sample application.

Expand Down

0 comments on commit 61f0160

Please sign in to comment.