Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Make instances self-contained * Remove unneeded runsettings files * Remove framework version check * Make self-contained build only for release artifacts * Remove workaround for fixed graph build bug * Don't copy App.config to bin folder * Update artifact exclusions * Add DBPath to startup record * Ensure that the correct config files are read * Add more artifact exclusions * Move duplicate instance files into separate zip file * Update Installer for new zip layout * Stop adding GC setting to app.config that isn't used * Move transport artifacts back into instances * Clean up unused list * Remove unneeded zip filter support * Update packaging tests to understand deploy changes * Update InstallerEngine tests * Build all projects with win-x64 RID when self-contained * React to PR feedback * Ensure RavenDB download script is used when WindowsSelfContained is true
- Loading branch information
Showing
66 changed files
with
305 additions
and
449 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
34 changes: 34 additions & 0 deletions
34
...ifacts/Particular.ServiceControl.Monitoring/Transports/AzureServiceBus/transport.manifest
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
{ | ||
"Version": "1.0.0", | ||
"Definitions": [ | ||
{ | ||
"Name": "AzureServiceBus.EndpointOriented", | ||
"DisplayName": "Azure Service Bus - Endpoint-oriented topology (Legacy)", | ||
"TypeName": "ServiceControl.Transports.ASB.ASBEndpointTopologyTransportCustomization, ServiceControl.Transports.ASB", | ||
"SampleConnectionString": "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=<owner>;SharedSecretValue=<someSecret>;QueueLengthQueryDelayInterval=<IntervalInMilliseconds(Default=500ms)>", | ||
"AvailableInSCMU": false, | ||
"Removed": true, | ||
"Aliases": [ | ||
"AzureServiceBus", | ||
"Azure Service Bus - Endpoint-oriented topology (Old)", | ||
"ServiceControl.Transports.LegacyAzureServiceBus.EndpointOrientedTopologyAzureServiceBusTransport, ServiceControl.Transports.LegacyAzureServiceBus", | ||
"ServiceControl.Transports.ASB.ASBEndpointTopologyTransportCustomization, ServiceControl.Transports.ASB", | ||
"NServiceBus.AzureServiceBusTransport, NServiceBus.Azure.Transports.WindowsAzureServiceBus" | ||
] | ||
}, | ||
{ | ||
"Name": "AzureServiceBus.Forwarding", | ||
"DisplayName": "Azure Service Bus - Forwarding topology (Legacy)", | ||
"TypeName": "ServiceControl.Transports.ASB.ASBForwardingTopologyTransportCustomization, ServiceControl.Transports.ASB", | ||
"SampleConnectionString": "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=<owner>;SharedSecretValue=<someSecret>;QueueLengthQueryDelayInterval=<IntervalInMilliseconds(Default=500ms)>", | ||
"AvailableInSCMU": false, | ||
"Removed": true, | ||
"AutoMigrateTo": "NetStandardAzureServiceBus", | ||
"Aliases": [ | ||
"Azure Service Bus - Forwarding topology (Legacy)", | ||
"Azure Service Bus - Forwarding topology (Old)", | ||
"ServiceControl.Transports.LegacyAzureServiceBus.ForwardingTopologyAzureServiceBusTransport, ServiceControl.Transports.LegacyAzureServiceBus" | ||
] | ||
} | ||
] | ||
} |
34 changes: 34 additions & 0 deletions
34
src/LegacyArtifacts/Particular.ServiceControl/Transports/AzureServiceBus/transport.manifest
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
{ | ||
"Version": "1.0.0", | ||
"Definitions": [ | ||
{ | ||
"Name": "AzureServiceBus.EndpointOriented", | ||
"DisplayName": "Azure Service Bus - Endpoint-oriented topology (Legacy)", | ||
"TypeName": "ServiceControl.Transports.ASB.ASBEndpointTopologyTransportCustomization, ServiceControl.Transports.ASB", | ||
"SampleConnectionString": "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=<owner>;SharedSecretValue=<someSecret>;QueueLengthQueryDelayInterval=<IntervalInMilliseconds(Default=500ms)>", | ||
"AvailableInSCMU": false, | ||
"Removed": true, | ||
"Aliases": [ | ||
"AzureServiceBus", | ||
"Azure Service Bus - Endpoint-oriented topology (Old)", | ||
"ServiceControl.Transports.LegacyAzureServiceBus.EndpointOrientedTopologyAzureServiceBusTransport, ServiceControl.Transports.LegacyAzureServiceBus", | ||
"ServiceControl.Transports.ASB.ASBEndpointTopologyTransportCustomization, ServiceControl.Transports.ASB", | ||
"NServiceBus.AzureServiceBusTransport, NServiceBus.Azure.Transports.WindowsAzureServiceBus" | ||
] | ||
}, | ||
{ | ||
"Name": "AzureServiceBus.Forwarding", | ||
"DisplayName": "Azure Service Bus - Forwarding topology (Legacy)", | ||
"TypeName": "ServiceControl.Transports.ASB.ASBForwardingTopologyTransportCustomization, ServiceControl.Transports.ASB", | ||
"SampleConnectionString": "Endpoint=sb://[namespace].servicebus.windows.net; SharedSecretIssuer=<owner>;SharedSecretValue=<someSecret>;QueueLengthQueryDelayInterval=<IntervalInMilliseconds(Default=500ms)>", | ||
"AvailableInSCMU": false, | ||
"Removed": true, | ||
"AutoMigrateTo": "NetStandardAzureServiceBus", | ||
"Aliases": [ | ||
"Azure Service Bus - Forwarding topology (Legacy)", | ||
"Azure Service Bus - Forwarding topology (Old)", | ||
"ServiceControl.Transports.LegacyAzureServiceBus.ForwardingTopologyAzureServiceBusTransport, ServiceControl.Transports.LegacyAzureServiceBus" | ||
] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
src/ServiceControl.AcceptanceTests.RavenDB/ServiceControl.runsettings
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
src/ServiceControl.Audit.AcceptanceTests.RavenDB/ServiceControl.runsettings
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
src/ServiceControl.Audit.AcceptanceTests/ServiceControl.runsettings
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
src/ServiceControl.Audit.UnitTests/ServiceControl.runsettings
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
namespace ServiceControl.Configuration | ||
{ | ||
using System.Configuration; | ||
using System.IO; | ||
using System.Linq; | ||
using System.Reflection; | ||
using System.Runtime.CompilerServices; | ||
|
||
public static class ExeConfiguration | ||
{ | ||
// ConfigurationManager on .NET is looking for {assembly}.dll.config files, but all previous versions of ServiceControl will have {assembly}.exe.config instead. | ||
// This code reads in the exe.config files and adds all the values into the ConfigurationManager's collections. | ||
public static void PopulateAppSettings(Assembly assembly) | ||
{ | ||
var location = Path.GetDirectoryName(assembly.Location); | ||
var assemblyName = Path.GetFileNameWithoutExtension(assembly.Location); | ||
var exeConfigPath = Path.Combine(location, $"{assemblyName}.exe.config"); | ||
var fileMap = new ExeConfigurationFileMap { ExeConfigFilename = exeConfigPath }; | ||
var configuration = ConfigurationManager.OpenMappedExeConfiguration(fileMap, ConfigurationUserLevel.None); | ||
|
||
foreach (var key in configuration.AppSettings.Settings.AllKeys) | ||
{ | ||
ConfigurationManager.AppSettings.Set(key, configuration.AppSettings.Settings[key].Value); | ||
} | ||
|
||
// The connection strings collection has had its read only flag set, so we need to clear it before we can add items to it | ||
UnsetCollectionReadonly(ConfigurationManager.ConnectionStrings); | ||
|
||
foreach (var connectionStringSetting in configuration.ConnectionStrings.ConnectionStrings.Cast<ConnectionStringSettings>()) | ||
{ | ||
ConfigurationManager.ConnectionStrings.Add(connectionStringSetting); | ||
} | ||
|
||
// Put the collection back into its previous state after we're done adding items to it | ||
SetCollectionReadOnly(ConfigurationManager.ConnectionStrings); | ||
} | ||
|
||
static void UnsetCollectionReadonly(ConfigurationElementCollection collection) | ||
{ | ||
ref bool field = ref GetReadOnlyFieldRef(collection); | ||
field = false; | ||
|
||
[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_readOnly")] | ||
static extern ref bool GetReadOnlyFieldRef(ConfigurationElementCollection collection); | ||
} | ||
|
||
[UnsafeAccessor(UnsafeAccessorKind.Method, Name = "SetReadOnly")] | ||
static extern void SetCollectionReadOnly(ConfigurationElementCollection collection); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
src/ServiceControl.MultiInstance.AcceptanceTests/ServiceControl.runsettings
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.