conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
this.EditAttributeFileButton = new System.Windows.Forms.Button();
this.EditIgnoreFileButton = new System.Windows.Forms.Button();
=======
this.AttributesFileButton = new System.Windows.Forms.Button();
this.IgnoreFileButton = new System.Windows.Forms.Button();
>>>>>>>
this.EditAttributeFileButton = new System.Windows.Forms.Button();
this.EditIgnoreFileButton = new System.Windows.Forms.Button();
<<<<<<<
this.RepositorySettingsBox.Controls.Add(this.EditAttributeFileButton);
this.RepositorySettingsBox.Controls.Add(this.EditIgnoreFileButton);
this.RepositorySettingsBox.Location = new System.Drawing.Point(6, 212);
=======
this.RepositorySettingsBox.Controls.Add(this.AttributesFileButton);
this.RepositorySettingsBox.Controls.Add(this.IgnoreFileButton);
this.RepositorySettingsBox.Location = new System.Drawing.Point(8, 261);
this.RepositorySettingsBox.Margin = new System.Windows.Forms.Padding(4);
>>>>>>>
this.RepositorySettingsBox.Controls.Add(this.EditAttributeFileButton);
this.RepositorySettingsBox.Controls.Add(this.EditIgnoreFileButton);
this.RepositorySettingsBox.Location = new System.Drawing.Point(6, 212);
this.RepositorySettingsBox.Controls.Add(this.EditAttributeFileButton);
this.RepositorySettingsBox.Controls.Add(this.EditIgnoreFileButton);
this.RepositorySettingsBox.Location = new System.Drawing.Point(8, 261);
this.RepositorySettingsBox.Margin = new System.Windows.Forms.Padding(4);
<<<<<<<
private Button EditAttributeFileButton;
private Button EditIgnoreFileButton;
=======
private Button AttributesFileButton;
private Button IgnoreFileButton;
>>>>>>>
private Button EditAttributeFileButton;
private Button EditIgnoreFileButton; |
<<<<<<<
public void FunctionReturnValueNotUsed_QuickFixWorks_NoInterface()
{
const string inputCode =
@"Public Function Foo(ByVal bar As String) As Boolean
If True Then
Foo = _
True
Else
Foo = False
End If
End Function";
const string expectedCode =
@"Public Sub Foo(ByVal bar As String)
If True Then
Else
End If
End Sub";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
var state = MockParser.CreateAndParse(vbe.Object);
var inspection = new FunctionReturnValueNotUsedInspection(state);
var inspectionResults = inspection.GetInspectionResults();
new ConvertToProcedureQuickFix(state).Fix(inspectionResults.First());
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
}
[TestMethod]
[TestCategory("Inspections")]
[TestCategory("Unused Value")]
public void FunctionReturnValueNotUsed_QuickFixWorks_NoInterface_ManyBodyStatements()
{
const string inputCode =
@"Function foo(ByRef fizz As Boolean) As Boolean
fizz = True
goo
label1:
foo = fizz
End Function
Sub goo()
End Sub";
const string expectedCode =
@"Sub foo(ByRef fizz As Boolean)
fizz = True
goo
label1:
End Sub
Sub goo()
End Sub";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
var state = MockParser.CreateAndParse(vbe.Object);
var inspection = new FunctionReturnValueNotUsedInspection(state);
var inspectionResults = inspection.GetInspectionResults();
new ConvertToProcedureQuickFix(state).Fix(inspectionResults.First());
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
}
[TestMethod]
[TestCategory("Inspections")]
[TestCategory("Unused Value")]
public void FunctionReturnValueNotUsed_QuickFixWorks_Interface()
{
const string inputInterfaceCode =
@"Public Function Test() As Integer
End Function";
const string expectedInterfaceCode =
@"Public Sub Test()
End Sub";
const string inputImplementationCode1 =
@"Implements IFoo
Public Function IFoo_Test() As Integer
IFoo_Test = 42
End Function";
const string inputImplementationCode2 =
@"Implements IFoo
Public Function IFoo_Test() As Integer
IFoo_Test = 42
End Function";
const string callSiteCode =
@"
Public Function Baz()
Dim testObj As IFoo
Set testObj = new Bar
testObj.Test
End Function";
var builder = new MockVbeBuilder();
var vbe = builder.ProjectBuilder("TestProject", ProjectProtection.Unprotected)
.AddComponent("IFoo", ComponentType.ClassModule, inputInterfaceCode)
.AddComponent("Bar", ComponentType.ClassModule, inputImplementationCode1)
.AddComponent("Bar2", ComponentType.ClassModule, inputImplementationCode2)
.AddComponent("TestModule", ComponentType.StandardModule, callSiteCode)
.MockVbeBuilder().Build();
var state = MockParser.CreateAndParse(vbe.Object);
var inspection = new FunctionReturnValueNotUsedInspection(state);
var inspectionResults = inspection.GetInspectionResults();
new ConvertToProcedureQuickFix(state).Fix(inspectionResults.First());
var component = vbe.Object.VBProjects[0].VBComponents[0];
Assert.AreEqual(expectedInterfaceCode, state.GetRewriter(component).GetText());
}
[TestMethod]
[TestCategory("Inspections")]
[TestCategory("Unused Value")]
public void FunctionReturnValueNotUsed_IgnoreQuickFixWorks()
{
const string inputCode =
@"Public Function Foo(ByVal bar As String) As Boolean
End Function
Public Sub Goo()
Foo ""test""
End Sub";
const string expectedCode =
@"'@Ignore FunctionReturnValueNotUsed
Public Function Foo(ByVal bar As String) As Boolean
End Function
Public Sub Goo()
Foo ""test""
End Sub";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
var state = MockParser.CreateAndParse(vbe.Object);
var inspection = new FunctionReturnValueNotUsedInspection(state);
var inspectionResults = inspection.GetInspectionResults();
new IgnoreOnceQuickFix(state, new[] { inspection }).Fix(inspectionResults.First());
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
}
[TestMethod]
[TestCategory("Inspections")]
[TestCategory("Unused Value")]
=======
>>>>>>> |
<<<<<<<
/// <param name="content">Member body content. Null results in an empty body. Formatting is the responsibility of the caller</param>
=======
/// <param name="content">Member body content.</param>
/// <param name="parameterIdentifier">Defaults to '<paramref name="propertyIdentifier"/>Value' unless otherwise specified</param>
>>>>>>>
/// <param name="content">Member body content.</param>
/// <param name="parameterIdentifier">Defaults to '<paramref name="propertyIdentifier"/>Value' unless otherwise specified</param>
<<<<<<<
/// <param name="content">Member body content. Null results in an empty body. Formatting is the responsibility of the caller</param>
/// <param name="parameterIdentifier">Defaults to 'RHS' unless otherwise specified</param>
=======
/// <param name="content">Member body content.</param>
/// <param name="parameterIdentifier">Defaults to '<paramref name="propertyIdentifier"/>Value' unless otherwise specified</param>
>>>>>>>
/// <param name="content">Member body content.</param>
/// <param name="parameterIdentifier">Defaults to 'RHS' unless otherwise specified</param>
<<<<<<<
/// <param name="content">Member body content. Null results in an empty body. Formatting is the responsibility of the caller</param>
/// <param name="parameterIdentifier">Defaults to 'RHS' unless otherwise specified</param>
=======
/// <param name="content">Member body content.</param>
/// <param name="parameterIdentifier">Defaults to '<paramref name="propertyIdentifier"/>Value' unless otherwise specified</param>
>>>>>>>
/// <param name="content">Member body content.</param>
/// <param name="parameterIdentifier">Defaults to 'RHS' unless otherwise specified</param>
<<<<<<<
/// <param name="indentation">If left null, 4 spaces of indentation are applied</param>
bool TryBuildUDTMemberDeclaration(string identifier, Declaration prototype, out string declaration, string indentation = null);
=======
bool TryBuildUDTMemberDeclaration(string identifier, Declaration prototype, out string declaration);
>>>>>>>
bool TryBuildUDTMemberDeclaration(string identifier, Declaration prototype, out string declaration);
<<<<<<<
? string.Join(Environment.NewLine, $"{AccessibilityToken(accessibility)} {TypeToken(letSetGetType)} {propertyIdentifier}() {asTypeClause}", content, EndStatement(letSetGetType))
: string.Join(Environment.NewLine, $"{AccessibilityToken(accessibility)} {TypeToken(letSetGetType)} {propertyIdentifier}({letSetParamExpression})", content, EndStatement(letSetGetType));
=======
? string.Join(Environment.NewLine, $"{accessibility ?? Tokens.Public} {TypeToken(letSetGetType)} {propertyIdentifier}() {asTypeClause}", content, EndStatement(letSetGetType))
: string.Join(Environment.NewLine, $"{accessibility ?? Tokens.Public} {TypeToken(letSetGetType)} {propertyIdentifier}({letSetParamExpression})", content, EndStatement(letSetGetType));
codeBlock = string.Join(Environment.NewLine, _indenter.Indent(codeBlock));
>>>>>>>
? string.Join(Environment.NewLine, $"{AccessibilityToken(accessibility)} {TypeToken(letSetGetType)} {propertyIdentifier}() {asTypeClause}", content, EndStatement(letSetGetType))
: string.Join(Environment.NewLine, $"{AccessibilityToken(accessibility)} {TypeToken(letSetGetType)} {propertyIdentifier}({letSetParamExpression})", content, EndStatement(letSetGetType));
codeBlock = string.Join(Environment.NewLine, _indenter.Indent(codeBlock)); |
<<<<<<<
/// Looks up a localized string similar to To the variable '{0}' of declared type '{1}' a value is set assigned with the incompatible declared type '{2}'. .
/// </summary>
public static string SetAssignmentWithIncompatibleObjectTypeInspection {
get {
return ResourceManager.GetString("SetAssignmentWithIncompatibleObjectTypeInspection", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die {0} '{1}' hides {2} '{3}'. ähnelt.
=======
/// Looks up a localized string similar to {0} '{1}' hides {2} '{3}'..
>>>>>>>
/// Looks up a localized string similar to To the variable '{0}' of declared type '{1}' a value is set assigned with the incompatible declared type '{2}'. .
/// </summary>
public static string SetAssignmentWithIncompatibleObjectTypeInspection {
get {
return ResourceManager.GetString("SetAssignmentWithIncompatibleObjectTypeInspection", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0} '{1}' hides {2} '{3}'.. |
<<<<<<<
correctors.Add(new OCLConstraintsCorrector(magicDrawReader,model,mdPackage));
correctors.Add(new AssociationTableCorrector(magicDrawReader,model,mdPackage));
correctors.Add(new FixCallBehaviorActionCorrector(magicDrawReader,model,mdPackage));
correctors.Add(new ConvertPropertiesToAttributes(magicDrawReader,model,mdPackage));
correctors.Add(new SetStructureCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new SetStatesOnObjects(magicDrawReader,model, mdPackage));
correctors.Add(new AddCrossMDzipRelationsCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new AddClassifiersToPartitions(magicDrawReader,model, mdPackage));
correctors.Add(new ASMAAssociationCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new SequenceDiagramCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new NotesCorrector(magicDrawReader, model, mdPackage));
correctors.Add(new ConvertPropertiesToAttributes(magicDrawReader,model,mdPackage));
correctors.Add(new SetStructureCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new SetStatesOnObjects(magicDrawReader,model, mdPackage));
correctors.Add(new AddCrossMDzipRelationsCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new AddClassifiersToPartitions(magicDrawReader,model, mdPackage));
correctors.Add(new ASMAAssociationCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new SequenceDiagramCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new DiagramLayoutCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new CorrectStereotypesAndTaggedValues(magicDrawReader,model, mdPackage));
correctors.Add(new CorrectActorDependencies(magicDrawReader, model, mdPackage));
correctors.Add(new MigrateDependencyMatrix(magicDrawReader,model, mdPackage));
correctors.Add(new FixAssociations(magicDrawReader, model, mdPackage));
correctors.Add(new FixMultiplicities(magicDrawReader, model, mdPackage));
=======
// correctors.Add(new OCLConstraintsCorrector(magicDrawReader,model,mdPackage));
// correctors.Add(new AssociationTableCorrector(magicDrawReader,model,mdPackage));
// correctors.Add(new FixCallBehaviorActionCorrector(magicDrawReader,model,mdPackage));
// correctors.Add(new NotesCorrector(magicDrawReader, model, mdPackage));
// correctors.Add(new ConvertPropertiesToAttributes(magicDrawReader,model,mdPackage));
// correctors.Add(new SetStructureCorrector(magicDrawReader,model, mdPackage));
// correctors.Add(new SetStatesOnObjects(magicDrawReader,model, mdPackage));
// correctors.Add(new AddCrossMDzipRelationsCorrector(magicDrawReader,model, mdPackage));
// correctors.Add(new AddClassifiersToPartitions(magicDrawReader,model, mdPackage));
// correctors.Add(new ASMAAssociationCorrector(magicDrawReader,model, mdPackage));
// correctors.Add(new SequenceDiagramCorrector(magicDrawReader,model, mdPackage));
// correctors.Add(new DiagramLayoutCorrector(magicDrawReader,model, mdPackage));
// correctors.Add(new CorrectStereotypesAndTaggedValues(magicDrawReader,model, mdPackage));
// correctors.Add(new CorrectActorDependencies(magicDrawReader, model, mdPackage));
// correctors.Add(new MigrateDependencyMatrix(magicDrawReader,model, mdPackage));
// correctors.Add(new FixAssociations(magicDrawReader, model, mdPackage));
// correctors.Add(new FixMultiplicities(magicDrawReader, model, mdPackage));
correctors.Add(new FixNavigabilityOnAssociations(magicDrawReader, model, mdPackage));
>>>>>>>
correctors.Add(new OCLConstraintsCorrector(magicDrawReader,model,mdPackage));
correctors.Add(new AssociationTableCorrector(magicDrawReader,model,mdPackage));
correctors.Add(new FixCallBehaviorActionCorrector(magicDrawReader,model,mdPackage));
correctors.Add(new ConvertPropertiesToAttributes(magicDrawReader,model,mdPackage));
correctors.Add(new SetStructureCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new SetStatesOnObjects(magicDrawReader,model, mdPackage));
correctors.Add(new AddCrossMDzipRelationsCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new AddClassifiersToPartitions(magicDrawReader,model, mdPackage));
correctors.Add(new ASMAAssociationCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new SequenceDiagramCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new NotesCorrector(magicDrawReader, model, mdPackage));
correctors.Add(new ConvertPropertiesToAttributes(magicDrawReader,model,mdPackage));
correctors.Add(new SetStructureCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new SetStatesOnObjects(magicDrawReader,model, mdPackage));
correctors.Add(new AddCrossMDzipRelationsCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new AddClassifiersToPartitions(magicDrawReader,model, mdPackage));
correctors.Add(new ASMAAssociationCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new SequenceDiagramCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new DiagramLayoutCorrector(magicDrawReader,model, mdPackage));
correctors.Add(new CorrectStereotypesAndTaggedValues(magicDrawReader,model, mdPackage));
correctors.Add(new CorrectActorDependencies(magicDrawReader, model, mdPackage));
correctors.Add(new MigrateDependencyMatrix(magicDrawReader,model, mdPackage));
correctors.Add(new FixAssociations(magicDrawReader, model, mdPackage));
correctors.Add(new FixMultiplicities(magicDrawReader, model, mdPackage));
correctors.Add(new FixNavigabilityOnAssociations(magicDrawReader, model, mdPackage)); |
<<<<<<<
Debug.Print("{0}.CanExecute evaluates to {1}", GetType().Name, canExecute);
=======
>>>>>>>
Debug.Print("{0}.CanExecute evaluates to {1}", GetType().Name, canExecute);
<<<<<<<
var declarations = _state.AllDeclarations;
ICodeModuleWrapper codeModuleWrapper = new CodeModuleWrapper(Vbe.ActiveCodePane.CodeModule);
var qualifiedSelection = Vbe.ActiveCodePane.GetQualifiedSelection();
Func<QualifiedSelection?, string, IExtractMethodModel> createMethodModel = ( qs, code) =>
{
if (qs == null)
{
return null;
}
//TODO: Pull these even further back;
var rules = new List<IExtractMethodRule>(){
new ExtractMethodRuleInSelection(),
new ExtractMethodRuleIsAssignedInSelection(),
new ExtractMethodRuleUsedAfter(),
new ExtractMethodRuleUsedBefore()};
var extractedMethod = new ExtractedMethod();
var extractedMethodModel = new ExtractMethodModel(rules,extractedMethod);
extractedMethodModel.extract(declarations, qs.Value, code);
return extractedMethodModel;
};
var extraction = new ExtractMethodExtraction();
var refactoring = new ExtractMethodRefactoring(codeModuleWrapper, createMethodModel, extraction);
=======
var factory = new ExtractMethodPresenterFactory(Vbe, _state.AllDeclarations, _indenter);
var refactoring = new ExtractMethodRefactoring(Vbe, _state, factory);
>>>>>>>
var declarations = _state.AllDeclarations;
var qualifiedSelection = Vbe.ActiveCodePane.GetQualifiedSelection();
var extractMethodValidation = new ExtractMethodSelectionValidation(declarations);
var canExecute = extractMethodValidation.withinSingleProcedure(qualifiedSelection.Value);
if (!canExecute)
{
return;
}
ICodeModuleWrapper codeModuleWrapper = new CodeModuleWrapper(Vbe.ActiveCodePane.CodeModule);
VBComponent vbComponent = Vbe.SelectedVBComponent;
Func<QualifiedSelection?, string, IExtractMethodModel> createMethodModel = ( qs, code) =>
{
if (qs == null)
{
return null;
}
//TODO: Pull these even further back;
// and implement with IProvider<IExtractMethodRule>
var rules = new List<IExtractMethodRule>(){
new ExtractMethodRuleInSelection(),
new ExtractMethodRuleIsAssignedInSelection(),
new ExtractMethodRuleUsedAfter(),
new ExtractMethodRuleUsedBefore()};
var extractedMethod = new ExtractedMethod();
var extractedMethodModel = new ExtractMethodModel(rules,extractedMethod);
extractedMethodModel.extract(declarations, qs.Value, code);
return extractedMethodModel;
};
var extraction = new ExtractMethodExtraction();
Action<Object> parseRequest = (obj) => _state.OnParseRequested(obj, vbComponent);
var refactoring = new ExtractMethodRefactoring(codeModuleWrapper, parseRequest , createMethodModel, extraction); |
<<<<<<<
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.Parsing.VBA;
using Rubberduck.VBEditor.Application;
=======
using Rubberduck.Inspections.Resources;
using Rubberduck.UI;
>>>>>>>
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.Parsing.VBA;
using Rubberduck.VBEditor.Application;
using Rubberduck.Inspections.Resources;
using Rubberduck.UI;
<<<<<<<
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new ConstantNotUsedInspection(parser.State);
=======
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
<<<<<<<
var inspection = new ConstantNotUsedInspection(parser.State);
=======
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
<<<<<<<
var inspection = new ConstantNotUsedInspection(parser.State);
=======
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
<<<<<<<
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new ConstantNotUsedInspection(parser.State);
=======
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
<<<<<<<
var inspection = new ConstantNotUsedInspection(parser.State);
=======
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
<<<<<<<
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new ConstantNotUsedInspection(parser.State);
=======
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new ConstantNotUsedInspection(parser.State);
<<<<<<<
var inspection = new ConstantNotUsedInspection(parser.State);
=======
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new ConstantNotUsedInspection(parser.State);
<<<<<<<
var inspection = new ConstantNotUsedInspection(parser.State);
=======
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new ConstantNotUsedInspection(parser.State);
<<<<<<<
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
var inspection = new ConstantNotUsedInspection(parser.State);
=======
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new ConstantNotUsedInspection(parser.State);
<<<<<<<
var inspection = new ConstantNotUsedInspection(parser.State);
=======
var inspection = new ConstantNotUsedInspection(state, new Mock<IMessageBox>().Object);
>>>>>>>
var inspection = new ConstantNotUsedInspection(parser.State); |
<<<<<<<
public void VariableTypeNotDeclared_QuickFixWorks_Parameter()
{
const string inputCode =
@"Sub Foo(arg1)
End Sub";
const string expectedCode =
@"Sub Foo(arg1 As Variant)
End Sub";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
var state = MockParser.CreateAndParse(vbe.Object);
var inspection = new VariableTypeNotDeclaredInspection(state);
new DeclareAsExplicitVariantQuickFix(state).Fix(inspection.GetInspectionResults().First());
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
}
[TestMethod]
[TestCategory("Inspections")]
public void VariableTypeNotDeclared_QuickFixWorks_SubNameContainsParameterName()
{
const string inputCode =
@"Sub Foo(Foo)
End Sub";
const string expectedCode =
@"Sub Foo(Foo As Variant)
End Sub";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
var state = MockParser.CreateAndParse(vbe.Object);
var inspection = new VariableTypeNotDeclaredInspection(state);
new DeclareAsExplicitVariantQuickFix(state).Fix(inspection.GetInspectionResults().First());
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
}
[TestMethod]
[TestCategory("Inspections")]
public void VariableTypeNotDeclared_QuickFixWorks_Variable()
{
const string inputCode =
@"Sub Foo()
Dim var1
End Sub";
const string expectedCode =
@"Sub Foo()
Dim var1 As Variant
End Sub";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
var state = MockParser.CreateAndParse(vbe.Object);
var inspection = new VariableTypeNotDeclaredInspection(state);
new DeclareAsExplicitVariantQuickFix(state).Fix(inspection.GetInspectionResults().First());
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
}
[TestMethod]
[TestCategory("Inspections")]
public void VariableTypeNotDeclared_QuickFixWorks_ParameterWithoutDefaultValue()
{
const string inputCode =
@"Sub Foo(ByVal Fizz)
End Sub";
const string expectedCode =
@"Sub Foo(ByVal Fizz As Variant)
End Sub";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
var state = MockParser.CreateAndParse(vbe.Object);
var inspection = new VariableTypeNotDeclaredInspection(state);
new DeclareAsExplicitVariantQuickFix(state).Fix(inspection.GetInspectionResults().First());
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
}
[TestMethod]
[TestCategory("Inspections")]
public void VariableTypeNotDeclared_QuickFixWorks_ParameterWithDefaultValue()
{
const string inputCode =
@"Sub Foo(ByVal Fizz = False)
End Sub";
const string expectedCode =
@"Sub Foo(ByVal Fizz As Variant = False)
End Sub";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
var state = MockParser.CreateAndParse(vbe.Object);
var inspection = new VariableTypeNotDeclaredInspection(state);
new DeclareAsExplicitVariantQuickFix(state).Fix(inspection.GetInspectionResults().First());
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
}
[TestMethod]
[TestCategory("Inspections")]
public void VariableTypeNotDeclared_IgnoreQuickFixWorks()
{
const string inputCode =
@"Sub Foo(arg1)
End Sub";
const string expectedCode =
@"'@Ignore VariableTypeNotDeclared
Sub Foo(arg1)
End Sub";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
var state = MockParser.CreateAndParse(vbe.Object);
var inspection = new VariableTypeNotDeclaredInspection(state);
new IgnoreOnceQuickFix(state, new[] { inspection }).Fix(inspection.GetInspectionResults().First());
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
}
[TestMethod]
[TestCategory("Inspections")]
=======
>>>>>>> |
<<<<<<<
m_GraphView.RegisterCallback<PostLayoutEvent>(OnPostLayout);
m_GraphView.onSelectionChanged += m_GraphInspectorView.UpdateSelection;
=======
m_GraphInspectorView.RegisterCallback<PostLayoutEvent>(OnPostLayout);
>>>>>>>
m_GraphView.RegisterCallback<PostLayoutEvent>(OnPostLayout);
m_GraphInspectorView.RegisterCallback<PostLayoutEvent>(OnPostLayout); |
<<<<<<<
var info = new DirectoryInfo(_rootPath);
return info.GetFiles().Select(file => file.Name).Where(name => name.EndsWith(Template.TemplateExtension)).ToList();
=======
var info = _filesystem.DirectoryInfo.FromDirectoryName(_rootPath);
return info.GetFiles().Select(file => file.Name).ToList();
>>>>>>>
var info = _filesystem.DirectoryInfo.FromDirectoryName(_rootPath);
return info.GetFiles().Select(file => file.Name).ToList();
<<<<<<<
_fullPath = fullPath + (fullPath.EndsWith(Template.TemplateExtension) ? string.Empty : Template.TemplateExtension);
=======
_fullPath = fullPath + (fullPath.EndsWith(".rdt") ? string.Empty : ".rdt");
_filesystem = fileSystem;
>>>>>>>
_fullPath = fullPath + (fullPath.EndsWith(Template.TemplateExtension) ? string.Empty : Template.TemplateExtension);
_filesystem = fileSystem; |
<<<<<<<
using MMALSharp.Ports.Controls;
using MMALSharp.Utility;
=======
using MMALSharp.Ports;
>>>>>>>
using MMALSharp.Ports.Controls; |
<<<<<<<
private void CbShowPageTooltips_OnChecked(object sender, RoutedEventArgs e)
{
if (IsInitialized)
{
App.Config.ShowPageTooltips = !((CheckBox) sender).IsChecked.Value;
App.Config.Save();
MainPage._MainPage.UpdateTooltips();
}
}
=======
private void BtnAdmin_Click(object sender, RoutedEventArgs e)
{
try
{
var processInfo = new ProcessStartInfo(System.Reflection.Assembly.GetExecutingAssembly().CodeBase)
{
UseShellExecute = true,
Verb = "runas"
};
Process.Start(processInfo);
Application.Current.Shutdown();
}
catch (Win32Exception ex)
{
MessageBox.Show(ex.Message);
if (ex.NativeErrorCode == 1223)
{
// User clicked no
}
else
{
// Unknown error
}
}
}
>>>>>>>
private void CbShowPageTooltips_OnChecked(object sender, RoutedEventArgs e)
{
if (IsInitialized)
{
App.Config.ShowPageTooltips = !((CheckBox) sender).IsChecked.Value;
App.Config.Save();
MainPage._MainPage.UpdateTooltips();
}
}
private void BtnAdmin_Click(object sender, RoutedEventArgs e)
{
try
{
var processInfo = new ProcessStartInfo(System.Reflection.Assembly.GetExecutingAssembly().CodeBase)
{
UseShellExecute = true,
Verb = "runas"
};
Process.Start(processInfo);
Application.Current.Shutdown();
}
catch (Win32Exception ex)
{
MessageBox.Show(ex.Message);
if (ex.NativeErrorCode == 1223)
{
// User clicked no
}
else
{
// Unknown error
}
}
} |
<<<<<<<
using FSO.Client.Controllers;
=======
using FSO.Common;
using FSO.Common.Rendering.Framework.IO;
>>>>>>>
using FSO.Client.Controllers;
using FSO.Common;
using FSO.Common.Rendering.Framework.IO;
<<<<<<<
//int min = NetworkFacade.ServerTime.Minute;
//int hour = NetworkFacade.ServerTime.Hour;
int min = 0;
int hour = 0;
=======
//ScaleX = ScaleY = 1;
>>>>>>>
//int min = NetworkFacade.ServerTime.Minute;
//int hour = NetworkFacade.ServerTime.Hour;
int min = 0;
int hour = 0; |
<<<<<<<
using FSO.Client.Controllers;
using System.Text.RegularExpressions;
=======
using FSO.Client.GameContent;
using FSO.Client.UI.Model;
>>>>>>>
using FSO.Client.Controllers;
using System.Text.RegularExpressions;
using FSO.Client.GameContent;
using FSO.Client.UI.Model; |
<<<<<<<
using FSO.Common.Utils;
using FSO.Common.DataService.Model;
using FSO.Client.Controllers;
using FSO.Common.DatabaseService.Model;
=======
using FSO.Common;
>>>>>>>
using FSO.Common.Utils;
using FSO.Common.DataService.Model;
using FSO.Client.Controllers;
using FSO.Common.DatabaseService.Model;
using FSO.Common;
<<<<<<<
NarrowSearchButton.OnButtonClick += SendSearch;
WideSearchUpButton.OnButtonClick += SendSearch;
SearchSlider.AttachButtons(SearchScrollUpButton, SearchScrollDownButton, 1);
SearchResult.AttachSlider(SearchSlider);
SearchResult.OnDoubleClick += SearchResult_OnDoubleClick;
ListBoxColors = script.Create<UIListBoxTextStyle>("ListBoxColors", SearchResult.FontStyle);
=======
SearchText.CurrentText = "freeso.ml";
NarrowSearchButton.OnButtonClick += JoinServerLot;
>>>>>>>
NarrowSearchButton.OnButtonClick += SendSearch;
WideSearchUpButton.OnButtonClick += SendSearch;
SearchSlider.AttachButtons(SearchScrollUpButton, SearchScrollDownButton, 1);
SearchResult.AttachSlider(SearchSlider);
SearchResult.OnDoubleClick += SearchResult_OnDoubleClick;
ListBoxColors = script.Create<UIListBoxTextStyle>("ListBoxColors", SearchResult.FontStyle); |
<<<<<<<
=======
UIGraphics = new UIGraphicsProvider(this);
AvatarMeshes = new AvatarMeshProvider(this, Device);
>>>>>>>
<<<<<<<
AvatarCollections = new AvatarCollectionsProvider(this);
AvatarThumbnails = new AvatarThumbnailProvider(this);
=======
AvatarHandgroups = new HandgroupProvider(this, Device);
AvatarCollections = new AvatarCollectionsProvider(this);
AvatarThumbnails = new AvatarThumbnailProvider(this, Device);
>>>>>>>
AvatarCollections = new AvatarCollectionsProvider(this);
AvatarThumbnails = new AvatarThumbnailProvider(this);
<<<<<<<
AvatarCollections.Init();
Ini.Init();
CityMaps.Init();
DataDefinition = new TSODataDefinition();
using (var stream = File.OpenRead(GetPath("TSOData_datadefinition.dat")))
{
DataDefinition.Read(stream);
}
=======
AvatarCollections.Init();
AvatarHandgroups.Init();
>>>>>>>
AvatarCollections.Init();
Ini.Init();
CityMaps.Init();
DataDefinition = new TSODataDefinition();
using (var stream = File.OpenRead(GetPath("TSOData_datadefinition.dat")))
{
DataDefinition.Read(stream);
} |
<<<<<<<
using static FSO.Content.WorldObjectCatalog;
=======
using FSO.Common;
>>>>>>>
using static FSO.Content.WorldObjectCatalog;
using FSO.Common; |
<<<<<<<
using FSO.Server.Protocol.CitySelector;
using FSO.Vitaboy;
using FSO.Client.Regulators;
using Ninject;
using FSO.Client.Controllers;
=======
using FSO.HIT;
using FSO.Client.UI.Model;
>>>>>>>
using FSO.Server.Protocol.CitySelector;
using FSO.Vitaboy;
using FSO.Client.Regulators;
using Ninject;
using FSO.Client.Controllers;
using FSO.HIT;
using FSO.Client.UI.Model;
<<<<<<<
var tracks = new string[]{
GlobalSettings.Default.StartupPath + "\\music\\modes\\select\\tsosas1_v2.mp3",
GlobalSettings.Default.StartupPath + "\\music\\modes\\select\\tsosas2_v2.mp3",
GlobalSettings.Default.StartupPath + "\\music\\modes\\select\\tsosas3.mp3",
GlobalSettings.Default.StartupPath + "\\music\\modes\\select\\tsosas4.mp3",
GlobalSettings.Default.StartupPath + "\\music\\modes\\select\\tsosas5.mp3"
};
PlayBackgroundMusic(tracks);
=======
HITVM.Get().PlaySoundEvent(UIMusic.SAS);
NetworkFacade.Controller.OnCityToken += new OnCityTokenDelegate(Controller_OnCityToken);
NetworkFacade.Controller.OnPlayerAlreadyOnline += new OnPlayerAlreadyOnlineDelegate(Controller_OnPlayerAlreadyOnline);
NetworkFacade.Controller.OnCharacterRetirement += new OnCharacterRetirementDelegate(Controller_OnCharacterRetirement);
>>>>>>>
HITVM.Get().PlaySoundEvent(UIMusic.SAS); |
<<<<<<<
using Ninject;
using FSO.Client.Regulators;
using FSO.Server.Protocol.Voltron.DataService;
using FSO.Common.DataService;
using FSO.Server.DataService.Providers.Client;
using FSO.Common.Domain;
using FSO.Common.Utils;
=======
using FSO.Common;
using Microsoft.Xna.Framework.Audio;
using System.Windows.Forms;
>>>>>>>
using Ninject;
using FSO.Client.Regulators;
using FSO.Server.Protocol.Voltron.DataService;
using FSO.Common.DataService;
using FSO.Server.DataService.Providers.Client;
using FSO.Common.Domain;
using FSO.Common.Utils;
using FSO.Common;
using Microsoft.Xna.Framework.Audio;
using System.Windows.Forms;
<<<<<<<
Log.UseSensibleDefaults();
Thread.CurrentThread.Name = "Game";
=======
//disabled for now. It's a hilarious mess and is causing linux to freak out.
//Log.UseSensibleDefaults();
>>>>>>>
//might want to disable for linux
Log.UseSensibleDefaults();
Thread.CurrentThread.Name = "Game";
<<<<<<<
var kernel = new StandardKernel(
new RegulatorsModule(),
new NetworkModule()
);
GameFacade.Kernel = kernel;
=======
OperatingSystem os = Environment.OSVersion;
PlatformID pid = os.Platform;
GameFacade.Linux = (pid == PlatformID.MacOSX || pid == PlatformID.Unix);
>>>>>>>
var kernel = new StandardKernel(
new RegulatorsModule(),
new NetworkModule()
);
GameFacade.Kernel = kernel;
OperatingSystem os = Environment.OSVersion;
PlatformID pid = os.Platform;
GameFacade.Linux = (pid == PlatformID.MacOSX || pid == PlatformID.Unix);
<<<<<<<
if (!GlobalSettings.Default.Windowed) Graphics.ToggleFullScreen();
//Bind ninject objects
kernel.Bind<FSO.Content.Content>().ToConstant(FSO.Content.Content.Get());
kernel.Load(new ClientDomainModule());
//Have to be eager with this, it sets a singleton instance on itself to avoid packets having
//to be created using Ninject for performance reasons
kernel.Get<cTSOSerializer>();
var ds = kernel.Get<DataService>();
ds.AddProvider(new ClientAvatarProvider());
=======
this.Window.TextInput += GameScreen.TextInput;
this.Window.Title = "FreeSO";
if (!GlobalSettings.Default.Windowed)
{
GameFacade.GraphicsDeviceManager.ToggleFullScreen();
}
>>>>>>>
//Bind ninject objects
kernel.Bind<FSO.Content.Content>().ToConstant(FSO.Content.Content.Get());
kernel.Load(new ClientDomainModule());
//Have to be eager with this, it sets a singleton instance on itself to avoid packets having
//to be created using Ninject for performance reasons
kernel.Get<cTSOSerializer>();
var ds = kernel.Get<DataService>();
ds.AddProvider(new ClientAvatarProvider());
this.Window.TextInput += GameScreen.TextInput;
this.Window.Title = "FreeSO";
if (!GlobalSettings.Default.Windowed)
{
GameFacade.GraphicsDeviceManager.ToggleFullScreen();
}
<<<<<<<
GameThread.UpdateExecuting = true;
GameFacade.SoundManager.MusicUpdate();
=======
NetworkFacade.Client.ProcessPackets();
>>>>>>>
GameThread.UpdateExecuting = true; |
<<<<<<<
AvatarCollections = new AvatarCollectionsProvider(this);
=======
AvatarHandgroups = new HandgroupProvider(this, Device);
AvatarThumbnails = new AvatarThumbnailProvider(this, Device);
>>>>>>>
AvatarCollections = new AvatarCollectionsProvider(this);
AvatarHandgroups = new HandgroupProvider(this, Device);
AvatarThumbnails = new AvatarThumbnailProvider(this, Device);
<<<<<<<
AvatarCollections.Init();
Ini.Init();
DataDefinition = new TSODataDefinition();
using (var stream = File.OpenRead(GetPath("TSOData_datadefinition.dat")))
{
DataDefinition.Read(stream);
}
=======
AvatarHandgroups.Init();
AvatarThumbnails.Init();
>>>>>>>
AvatarCollections.Init();
Ini.Init();
DataDefinition = new TSODataDefinition();
using (var stream = File.OpenRead(GetPath("TSOData_datadefinition.dat")))
{
DataDefinition.Read(stream);
}
AvatarHandgroups.Init();
AvatarThumbnails.Init();
<<<<<<<
public AvatarCollectionsProvider AvatarCollections;
=======
public AvatarThumbnailProvider AvatarThumbnails;
>>>>>>>
public AvatarCollectionsProvider AvatarCollections;
public AvatarThumbnailProvider AvatarThumbnails; |
<<<<<<<
using FSO.Client.Controllers;
using FSO.Client.Controllers.Panels;
=======
using FSO.Client.Debug;
using FSO.Client.UI.Panels.WorldUI;
using FSO.SimAntics.Engine.TSOTransaction;
>>>>>>>
using FSO.Client.Controllers;
using FSO.Client.Controllers.Panels;
using FSO.Client.Debug;
using FSO.Client.UI.Panels.WorldUI;
using FSO.SimAntics.Engine.TSOTransaction;
<<<<<<<
=======
/** City Scene **/
ListenForMouse(new Rectangle(0, 0, ScreenWidth, ScreenHeight), new UIMouseEvent(MouseHandler));
CityRenderer = new Terrain(GameFacade.Game.GraphicsDevice); //The Terrain class implements the ThreeDAbstract interface so that it can be treated as a scene but manage its own drawing and updates.
city = "Queen Margaret's";
if (PlayerAccount.CurrentlyActiveSim != null)
city = PlayerAccount.CurrentlyActiveSim.ResidingCity.Name;
CityRenderer.m_GraphicsDevice = GameFacade.GraphicsDevice;
CityRenderer.Initialize(city, GameFacade.CDataRetriever);
CityRenderer.LoadContent(GameFacade.GraphicsDevice);
CityRenderer.RegenData = true;
CityRenderer.SetTimeOfDay(0.5);
StateChanges = new Queue<SimConnectStateChange>();
>>>>>>>
StateChanges = new Queue<SimConnectStateChange>();
<<<<<<<
var alert = UIScreen.GlobalShowAlert(new UIAlertOptions
=======
var reason = (VMCloseNetReason)progress;
if (reason == VMCloseNetReason.Unspecified)
>>>>>>>
var reason = (VMCloseNetReason)progress;
if (reason == VMCloseNetReason.Unspecified) |
<<<<<<<
private IDictionary<string, ThreeDRepFile> _representationFiles;
private IDictionary<string, ReferenceRep> _internalReferenceRepresentation;
private IDictionary<string, InstanceRep> _internalInstanceRepresentation;
=======
private IDictionary<string, ThreeDXMLFile> _representationFiles;
>>>>>>>
private IDictionary<string, ThreeDXMLFile> _representationFiles;
private IDictionary<string, ReferenceRep> _internalReferenceRepresentation;
private IDictionary<string, InstanceRep> _internalInstanceRepresentation;
<<<<<<<
public void Fill3DRepresentation(IList<ReferenceRep> faces)
=======
public void Fill3DRepresentation(IList<ThreeDXMLFile> faces)
>>>>>>>
public void Fill3DRepresentation(IList<ThreeDXMLFile> faces) |
<<<<<<<
//SimCatalog.LoadSim3D(sim, maleHeads.First().PurchasableObject.Outfit, AppearanceType.Light);
//
sim.HeadOutfitID = 4462471020557;
sim.AppearanceType = AppearanceType.Light;
SimCatalog.LoadSim3D(sim);
=======
SimCatalog.LoadSim3D(sim, SimCatalog.GetOutfit(4462471020557), AppearanceType.Light);
>>>>>>>
//SimCatalog.LoadSim3D(sim, maleHeads.First().PurchasableObject.Outfit, AppearanceType.Light);
//
sim.HeadOutfitID = 4462471020557;
sim.AppearanceType = AppearanceType.Light;
SimCatalog.LoadSim3D(sim);
//SimCatalog.LoadSim3D(sim, SimCatalog.GetOutfit(4462471020557), AppearanceType.Light); |
<<<<<<<
=======
public static Texture2D StoreTexture(ulong id, ContentResource assetData)
{
return StoreTexture(id, assetData, true, false);
}
public static Texture2D StoreTexture(ulong id, ContentResource assetData, bool mask, bool cacheOnDisk)
{
/**
* This may not be the right way to get the texture to load as ARGB but it works :S
*/
Texture2D texture = null;
using (var stream = new MemoryStream(assetData.Data, false))
{
var isCached = assetData.FromCache;
if (mask && !isCached)
{
//var textureParams = Texture2D.GetCreationParameters(GameFacade.GraphicsDevice, stream);
//textureParams.Format = SurfaceFormat.Color;
stream.Seek(0, SeekOrigin.Begin);
texture = ImageLoader.FromStream(GameFacade.GraphicsDevice, stream); //, textureParams);
//TextureUtils.ManualTextureMaskSingleThreaded(ref texture, MASK_COLORS);
}
else
{
texture = ImageLoader.FromStream(GameFacade.GraphicsDevice, stream);
}
UI_TEXTURE_CACHE.Add(id, texture);
return texture;
}
}
>>>>>>>
<<<<<<<
=======
public static Texture2D GetTexture(ulong id)
{
try
{
return Content.Content.Get().UIGraphics.Get(id).Get(GameFacade.GraphicsDevice);
}
catch (Exception e)
{
}
//TODO: darren wants to return null here. that might break some existing code
return new Texture2D(GameFacade.GraphicsDevice, 1, 1);
}
private static Dictionary<ulong, Texture2D> UI_TEXTURE_CACHE = new Dictionary<ulong, Texture2D>();
>>>>>>> |
<<<<<<<
int ExplicitInterfaceMember();
=======
void ThrowException(string message);
>>>>>>>
int ExplicitInterfaceMember();
void ThrowException(string message); |
<<<<<<<
[Fact]
public async Task ExplicitInterfaceOperation()
{
int actual = await _client.InvokeAsync(x => x.ExplicitInterfaceMember());
Assert.True(actual == 0);
}
=======
[Fact]
public async Task ThrowException()
{
try
{
await _client.InvokeAsync(x => x.ThrowException("This was forced"));
}
catch (IpcServerException ex)
{
Assert.Contains("This was forced", ex.Message);
Assert.DoesNotContain(IpcServerException.ServerFailureDetails, ex.ToString());
}
}
>>>>>>>
[Fact]
public async Task ExplicitInterfaceOperation()
{
int actual = await _client.InvokeAsync(x => x.ExplicitInterfaceMember());
Assert.True(actual == 0);
}
[Fact]
public async Task ThrowException()
{
try
{
await _client.InvokeAsync(x => x.ThrowException("This was forced"));
}
catch (IpcServerException ex)
{
Assert.Contains("This was forced", ex.Message);
Assert.DoesNotContain(IpcServerException.ServerFailureDetails, ex.ToString());
}
} |
<<<<<<<
if (_throttle != null)
await _throttle.WaitAsync();
TcpClient client = await _listener.AcceptTcpClientAsync();
=======
TcpClient client = await _listener.AcceptTcpClientAsync().ConfigureAwait(false);
>>>>>>>
if (_throttle != null)
await _throttle.WaitAsync();
TcpClient client = await _listener.AcceptTcpClientAsync().ConfigureAwait(false);
<<<<<<<
if (_throttle == null)
{
await ProcessAsync(server, _logger, cancellationToken);
}
else
{
var processTask = Task.Run(
async () =>
{
try
{
await ProcessAsync(server, _logger, cancellationToken);
}
catch when (cancellationToken.IsCancellationRequested) { }
finally
{
_throttle.Release();
}
});
}
=======
await ProcessAsync(server, _logger, cancellationToken).ConfigureAwait(false);
>>>>>>>
if (_throttle == null)
{
await ProcessAsync(server, _logger, cancellationToken);
}
else
{
var processTask = Task.Run(
async () =>
{
try
{
await ProcessAsync(server, _logger, cancellationToken).ConfigureAwait(false);
}
catch when (cancellationToken.IsCancellationRequested) { }
finally
{
_throttle.Release();
}
});
} |
<<<<<<<
if (client == null)
=======
if (client == null || IsSelecting)
{
>>>>>>>
if (client == null || IsSelecting)
{
<<<<<<<
public string SelectionMode
{
get { return _selectionMode; }
set
{
if (_selectionMode == value)
{
return;
}
_selectionMode = value;
OnPropertyChanged();
}
}
public List<ResourceInfo> RemoveResourceInfos { get; set; }
=======
public bool IsSelecting
{
get { return _isSelecting; }
set
{
if (_isSelecting == value)
{
return;
}
_isSelecting = value;
SelectionMode = _isSelecting ? "Multiple" : "Single";
OnPropertyChanged();
}
}
public string SelectionMode
{
get { return _selectionMode; }
set
{
if (_selectionMode == value)
{
return;
}
_selectionMode = value;
OnPropertyChanged();
}
}
public List<ResourceInfo> RemoveResourceInfos { get; set; }
>>>>>>>
public string SelectionMode
{
get { return _selectionMode; }
set
{
if (_selectionMode == value)
{
return;
}
_selectionMode = value;
OnPropertyChanged();
}
}
public bool IsSelecting
{
get { return _isSelecting; }
set
{
if (_isSelecting == value)
{
return;
}
_isSelecting = value;
SelectionMode = _isSelecting ? "Multiple" : "Single";
OnPropertyChanged();
}
}
public string SelectionMode
{
get { return _selectionMode; }
set
{
if (_selectionMode == value)
{
return;
}
_selectionMode = value;
OnPropertyChanged();
}
}
public List<ResourceInfo> RemoveResourceInfos { get; set; }
public List<ResourceInfo> RemoveResourceInfos { get; set; } |
<<<<<<<
protected override void OnShareTargetActivated(ShareTargetActivatedEventArgs args)
{
base.OnShareTargetActivated(args);
OnActivated(args);
}
protected override void OnFileSavePickerActivated(FileSavePickerActivatedEventArgs args)
{
base.OnFileSavePickerActivated(args);
OnActivated(args);
}
protected override void OnCachedFileUpdaterActivated(CachedFileUpdaterActivatedEventArgs args)
{
base.OnCachedFileUpdaterActivated(args);
OnActivated(args);
}
protected override void OnFileActivated(FileActivatedEventArgs args)
{
base.OnFileActivated(args);
OnActivated(args);
}
protected override async Task OnActivateApplicationAsync(IActivatedEventArgs args)
{
ActivatedEventArgs = args;
await base.OnActivateApplicationAsync(args);
if (args.Kind == ActivationKind.ShareTarget)
{
var activatedEventArgs = args as ShareTargetActivatedEventArgs;
if (activatedEventArgs != null)
{
var sorageItems = await activatedEventArgs.ShareOperation.Data.GetStorageItemsAsync();
var pageParameters = new ShareTargetPageParameters()
{
//ShareOperation = activatedEventArgs.ShareOperation,
ActivationKind = ActivationKind.ShareTarget,
FileTokens = new List<string>()
};
StorageApplicationPermissions.FutureAccessList.Clear();
foreach (var storageItem in sorageItems)
{
var token = StorageApplicationPermissions.FutureAccessList.Add(storageItem);
pageParameters.FileTokens.Add(token);
}
activatedEventArgs.ShareOperation.ReportDataRetrieved();
CheckSettingsAndContinue(PageToken.ShareTarget, pageParameters);
}
}
else if (args.Kind == ActivationKind.FileSavePicker || args.Kind == ActivationKind.CachedFileUpdater)
{
CheckSettingsAndContinue(PageToken.FileSavePicker, null);
}
else if (args.Kind == ActivationKind.File)
{
var activatedEventArgs = args as FileActivatedEventArgs;
if (activatedEventArgs != null)
{
var sorageItems = activatedEventArgs.Files;
var pageParameters = new ShareTargetPageParameters()
{
//ShareOperation = activatedEventArgs.ShareOperation,
ActivationKind = ActivationKind.ShareTarget,
FileTokens = new List<string>()
};
StorageApplicationPermissions.FutureAccessList.Clear();
foreach (var storageItem in sorageItems)
{
var token = StorageApplicationPermissions.FutureAccessList.Add(storageItem);
pageParameters.FileTokens.Add(token);
}
CheckSettingsAndContinue(PageToken.ShareTarget, pageParameters);
}
}
}
=======
protected override Task OnSuspendingApplicationAsync()
{
var task = base.OnSuspendingApplicationAsync();
// Stop Background Sync Tasks
List<FolderSyncInfo> activeSyncs = SyncDbUtils.GetActiveSyncInfos();
foreach(var fsi in activeSyncs)
{
ToastNotificationService.ShowSyncSuspendedNotification(fsi);
SyncDbUtils.UnlockFolderSyncInfo(fsi);
}
return task;
}
>>>>>>>
protected override void OnShareTargetActivated(ShareTargetActivatedEventArgs args)
{
base.OnShareTargetActivated(args);
OnActivated(args);
}
protected override void OnFileSavePickerActivated(FileSavePickerActivatedEventArgs args)
{
base.OnFileSavePickerActivated(args);
OnActivated(args);
}
protected override void OnCachedFileUpdaterActivated(CachedFileUpdaterActivatedEventArgs args)
{
base.OnCachedFileUpdaterActivated(args);
OnActivated(args);
}
protected override void OnFileActivated(FileActivatedEventArgs args)
{
base.OnFileActivated(args);
OnActivated(args);
}
protected override async Task OnActivateApplicationAsync(IActivatedEventArgs args)
{
ActivatedEventArgs = args;
await base.OnActivateApplicationAsync(args);
if (args.Kind == ActivationKind.ShareTarget)
{
var activatedEventArgs = args as ShareTargetActivatedEventArgs;
if (activatedEventArgs != null)
{
var sorageItems = await activatedEventArgs.ShareOperation.Data.GetStorageItemsAsync();
var pageParameters = new ShareTargetPageParameters()
{
//ShareOperation = activatedEventArgs.ShareOperation,
ActivationKind = ActivationKind.ShareTarget,
FileTokens = new List<string>()
};
StorageApplicationPermissions.FutureAccessList.Clear();
foreach (var storageItem in sorageItems)
{
var token = StorageApplicationPermissions.FutureAccessList.Add(storageItem);
pageParameters.FileTokens.Add(token);
}
activatedEventArgs.ShareOperation.ReportDataRetrieved();
CheckSettingsAndContinue(PageToken.ShareTarget, pageParameters);
}
}
else if (args.Kind == ActivationKind.FileSavePicker || args.Kind == ActivationKind.CachedFileUpdater)
{
CheckSettingsAndContinue(PageToken.FileSavePicker, null);
}
else if (args.Kind == ActivationKind.File)
{
var activatedEventArgs = args as FileActivatedEventArgs;
if (activatedEventArgs != null)
{
var sorageItems = activatedEventArgs.Files;
var pageParameters = new ShareTargetPageParameters()
{
//ShareOperation = activatedEventArgs.ShareOperation,
ActivationKind = ActivationKind.ShareTarget,
FileTokens = new List<string>()
};
StorageApplicationPermissions.FutureAccessList.Clear();
foreach (var storageItem in sorageItems)
{
var token = StorageApplicationPermissions.FutureAccessList.Add(storageItem);
pageParameters.FileTokens.Add(token);
}
CheckSettingsAndContinue(PageToken.ShareTarget, pageParameters);
}
}
}
protected override Task OnSuspendingApplicationAsync()
{
var task = base.OnSuspendingApplicationAsync();
// Stop Background Sync Tasks
List<FolderSyncInfo> activeSyncs = SyncDbUtils.GetActiveSyncInfos();
foreach(var fsi in activeSyncs)
{
ToastNotificationService.ShowSyncSuspendedNotification(fsi);
SyncDbUtils.UnlockFolderSyncInfo(fsi);
}
return task;
}
<<<<<<<
NavigationService.Navigate(requestedPage.ToString(), pageParameters?.Serialize());
=======
// Remove unnecessary notifications whenever the app is used.
ToastNotificationManager.History.RemoveGroup(ToastNotificationService.SYNCACTION);
PinStartPageParameters pageParameters = null;
if (!string.IsNullOrEmpty(args.Arguments))
{
var tmpResourceInfo = JsonConvert.DeserializeObject<ResourceInfo>(args.Arguments);
if (tmpResourceInfo != null)
{
pageParameters = new PinStartPageParameters()
{
ResourceInfo = tmpResourceInfo,
PageTarget = tmpResourceInfo.IsDirectory() ? PageTokens.DirectoryList.ToString() : PageTokens.FileInfo.ToString()
};
}
}
if (SettingsService.Instance.LocalSettings.UseWindowsHello)
{
NavigationService.Navigate(
PageTokens.Verification.ToString(),
pageParameters?.Serialize());
}
else
{
NavigationService.Navigate(
pageParameters!=null ? pageParameters.PageTarget : PageTokens.DirectoryList.ToString(),
pageParameters?.Serialize());
}
>>>>>>>
// Remove unnecessary notifications whenever the app is used.
ToastNotificationManager.History.RemoveGroup(ToastNotificationService.SYNCACTION);
PinStartPageParameters pageParameters = null;
if (!string.IsNullOrEmpty(args.Arguments))
{
var tmpResourceInfo = JsonConvert.DeserializeObject<ResourceInfo>(args.Arguments);
if (tmpResourceInfo != null)
{
pageParameters = new PinStartPageParameters()
{
ResourceInfo = tmpResourceInfo,
PageTarget = tmpResourceInfo.IsDirectory() ? PageTokens.DirectoryList.ToString() : PageTokens.FileInfo.ToString()
};
}
}
if (SettingsService.Instance.LocalSettings.UseWindowsHello)
{
NavigationService.Navigate(
PageTokens.Verification.ToString(),
pageParameters?.Serialize());
}
else
{
NavigationService.Navigate(
pageParameters!=null ? pageParameters.PageTarget : PageTokens.DirectoryList.ToString(),
pageParameters?.Serialize());
}
<<<<<<<
=======
// Ensure the current window is active
Window.Current.Activate();
return Task.FromResult(true);
}
protected override Task OnActivateApplicationAsync(IActivatedEventArgs e)
{
// Remove unnecessary notifications whenever the app is used.
ToastNotificationManager.History.RemoveGroup(ToastNotificationService.SYNCACTION);
// Handle toast activation
if (e is ToastNotificationActivatedEventArgs)
{
var toastActivationArgs = e as ToastNotificationActivatedEventArgs;
// Parse the query string
QueryString args = QueryString.Parse(toastActivationArgs.Argument);
// See what action is being requested
switch (args["action"])
{
// Nothing to do here
case ToastNotificationService.SYNCACTION:
NavigationService.Navigate(PageTokens.DirectoryList.ToString(), null);
break;
// Open Conflict Page
case ToastNotificationService.SYNCONFLICTACTION:
ToastNotificationManager.History.RemoveGroup(ToastNotificationService.SYNCONFLICTACTION);
NavigationService.Navigate(PageTokens.SyncConflict.ToString(), null);
break;
}
}
// Ensure the current window is active
Window.Current.Activate();
return Task.FromResult(true);
>>>>>>>
// Ensure the current window is active
Window.Current.Activate();
return Task.FromResult(true);
}
protected override Task OnActivateApplicationAsync(IActivatedEventArgs e)
{
// Remove unnecessary notifications whenever the app is used.
ToastNotificationManager.History.RemoveGroup(ToastNotificationService.SYNCACTION);
// Handle toast activation
if (e is ToastNotificationActivatedEventArgs)
{
var toastActivationArgs = e as ToastNotificationActivatedEventArgs;
// Parse the query string
QueryString args = QueryString.Parse(toastActivationArgs.Argument);
// See what action is being requested
switch (args["action"])
{
// Nothing to do here
case ToastNotificationService.SYNCACTION:
NavigationService.Navigate(PageTokens.DirectoryList.ToString(), null);
break;
// Open Conflict Page
case ToastNotificationService.SYNCONFLICTACTION:
ToastNotificationManager.History.RemoveGroup(ToastNotificationService.SYNCONFLICTACTION);
NavigationService.Navigate(PageTokens.SyncConflict.ToString(), null);
break;
}
}
// Ensure the current window is active
Window.Current.Activate();
return Task.FromResult(true); |
<<<<<<<
sigStr.Dispose();
byte[] sigBytes = ((IBlockResult)calculator.GetResult()).DoFinal();
=======
sigStr.Close();
byte[] sigBytes = ((IBlockResult)calculator.GetResult()).Collect();
>>>>>>>
sigStr.Dispose();
byte[] sigBytes = ((IBlockResult)calculator.GetResult()).Collect(); |
<<<<<<<
=======
public GameStateData gameState;
>>>>>>>
public GameStateData gameState;
<<<<<<<
//DontDestroyOnLoad(gameObject);
actionList = listBuilder();
//testRun();
=======
//testRun();
>>>>>>>
//testRun(); |
<<<<<<<
object[] a)
{
StringBuilder sb = new StringBuilder('[');
if (a.Length > 0)
{
sb.Append(a[0]);
for (int index = 1; index < a.Length; ++index)
{
sb.Append(", ").Append(a[index]);
}
}
sb.Append(']');
return sb.ToString();
}
public static int GetHashCode(byte[] data)
{
if (data == null)
{
return 0;
}
int i = data.Length;
int hc = i + 1;
while (--i >= 0)
{
hc *= 257;
hc ^= data[i];
}
return hc;
}
public static int GetHashCode(int[] data)
{
if (data == null)
{
return 0;
}
int i = data.Length;
int hc = i + 1;
while (--i >= 0)
{
hc *= 257;
hc ^= data[i];
}
return hc;
}
public static byte[] Clone(
byte[] data)
{
return data == null ? null : (byte[]) data.Clone();
}
public static int[] Clone(
int[] data)
{
return data == null ? null : (int[]) data.Clone();
}
public static void Fill(
byte[] buf,
byte b)
{
int i = buf.Length;
while (i > 0)
{
buf[--i] = b;
}
}
=======
object[] a)
{
StringBuilder sb = new StringBuilder('[');
if (a.Length > 0)
{
sb.Append(a[0]);
for (int index = 1; index < a.Length; ++index)
{
sb.Append(", ").Append(a[index]);
}
}
sb.Append(']');
return sb.ToString();
}
public static int GetHashCode(
byte[] data)
{
if (data == null)
{
return 0;
}
int i = data.Length;
int hc = i + 1;
while (--i >= 0)
{
hc *= 257;
hc ^= data[i];
}
return hc;
}
public static byte[] Clone(
byte[] data)
{
return data == null ? null : (byte[]) data.Clone();
}
public static byte[] Clone(
byte[] data,
byte[] existing)
{
if (data == null)
{
return null;
}
if ((existing == null) || (existing.Length != data.Length))
{
return Clone(data);
}
Array.Copy(data, 0, existing, 0, existing.Length);
return existing;
}
public static int[] Clone(
int[] data)
{
return data == null ? null : (int[]) data.Clone();
}
[CLSCompliantAttribute(false)]
public static ulong[] Clone(
ulong[] data)
{
return data == null ? null : (ulong[]) data.Clone();
}
[CLSCompliantAttribute(false)]
public static ulong[] Clone(
ulong[] data,
ulong[] existing)
{
if (data == null)
{
return null;
}
if ((existing == null) || (existing.Length != data.Length))
{
return Clone(data);
}
Array.Copy(data, 0, existing, 0, existing.Length);
return existing;
}
public static void Fill(
byte[] buf,
byte b)
{
int i = buf.Length;
while (i > 0)
{
buf[--i] = b;
}
}
>>>>>>>
object[] a)
{
StringBuilder sb = new StringBuilder('[');
if (a.Length > 0)
{
sb.Append(a[0]);
for (int index = 1; index < a.Length; ++index)
{
sb.Append(", ").Append(a[index]);
}
}
sb.Append(']');
return sb.ToString();
}
public static int GetHashCode(byte[] data)
{
if (data == null)
{
return 0;
}
int i = data.Length;
int hc = i + 1;
while (--i >= 0)
{
hc *= 257;
hc ^= data[i];
}
return hc;
}
public static int GetHashCode(int[] data)
{
if (data == null)
{
return 0;
}
int i = data.Length;
int hc = i + 1;
while (--i >= 0)
{
hc *= 257;
hc ^= data[i];
}
return hc;
}
public static byte[] Clone(
byte[] data)
{
return data == null ? null : (byte[]) data.Clone();
}
public static int[] Clone(
int[] data)
{
return data == null ? null : (int[]) data.Clone();
}
public static void Fill(
byte[] buf,
byte b)
{
int i = buf.Length;
while (i > 0)
{
buf[--i] = b;
}
}
[CLSCompliantAttribute(false)]
public static ulong[] Clone(
ulong[] data)
{
return data == null ? null : (ulong[]) data.Clone();
}
[CLSCompliantAttribute(false)]
public static ulong[] Clone(
ulong[] data,
ulong[] existing)
{
if (data == null)
{
return null;
}
if ((existing == null) || (existing.Length != data.Length))
{
return Clone(data);
}
Array.Copy(data, 0, existing, 0, existing.Length);
return existing;
} |
<<<<<<<
[TestFixture]
public class SecureRandomTest
{
#if !NETCF_1_0 && !PCL
[Test]
public void TestCryptoApi()
{
SecureRandom random = new SecureRandom(
new CryptoApiRandomGenerator());
checkSecureRandom(random);
}
=======
[TestFixture]
public class SecureRandomTest
{
#if !NETCF_1_0
[Test]
public void TestCryptoApi()
{
SecureRandom random = new SecureRandom(
new CryptoApiRandomGenerator());
CheckSecureRandom(random);
}
>>>>>>>
[TestFixture]
public class SecureRandomTest
{
#if !NETCF_1_0 && !PCL
[Test]
public void TestCryptoApi()
{
SecureRandom random = new SecureRandom(
new CryptoApiRandomGenerator());
CheckSecureRandom(random);
} |
<<<<<<<
#if NETCF_1_0 || PCL
=======
>>>>>>> |
<<<<<<<
sigStr.Dispose();
byte[] sigBytes = sig.GenerateSignature();
=======
sigStr.Close();
byte[] sigBytes = ((IBlockResult)calculator.GetResult()).DoFinal();
>>>>>>>
sigStr.Dispose();
byte[] sigBytes = ((IBlockResult)calculator.GetResult()).DoFinal(); |
<<<<<<<
using System.Linq;
=======
using System.Text.RegularExpressions;
>>>>>>>
using System.Text.RegularExpressions;
using System.Linq; |
<<<<<<<
[Parser(Opcode.SMSG_CANCEL_AUTO_REPEAT)]
public static void HandleCancelAutoRepeat(Packet packet)
{
var guid = new byte[8];
packet.StartBitStream(guid, 1, 3, 0, 4, 6, 7, 5, 2);
packet.ParseBitStream(guid, 7, 6, 2, 5, 0, 4, 1, 3);
packet.WriteGuid("Guid", guid);
}
[Parser(Opcode.SMSG_DUEL_REQUESTED)]
public static void HandleDuelRequested(Packet packet)
{
var guid1 = new byte[8];
var guid2 = new byte[8];
guid1[5] = packet.ReadBit();
guid2[4] = packet.ReadBit();
guid2[2] = packet.ReadBit();
guid2[7] = packet.ReadBit();
guid1[0] = packet.ReadBit();
guid2[5] = packet.ReadBit();
guid1[4] = packet.ReadBit();
guid1[6] = packet.ReadBit();
guid2[1] = packet.ReadBit();
guid2[3] = packet.ReadBit();
guid2[6] = packet.ReadBit();
guid1[7] = packet.ReadBit();
guid1[3] = packet.ReadBit();
guid1[2] = packet.ReadBit();
guid1[1] = packet.ReadBit();
guid2[0] = packet.ReadBit();
packet.ReadXORByte(guid1, 5);
packet.ReadXORByte(guid1, 3);
packet.ReadXORByte(guid2, 7);
packet.ReadXORByte(guid2, 4);
packet.ReadXORByte(guid1, 7);
packet.ReadXORByte(guid2, 3);
packet.ReadXORByte(guid2, 6);
packet.ReadXORByte(guid2, 0);
packet.ReadXORByte(guid1, 4);
packet.ReadXORByte(guid2, 2);
packet.ReadXORByte(guid2, 1);
packet.ReadXORByte(guid1, 0);
packet.ReadXORByte(guid1, 2);
packet.ReadXORByte(guid1, 6);
packet.ReadXORByte(guid1, 1);
packet.ReadXORByte(guid2, 5);
packet.WriteGuid("Flag GUID", guid1);
packet.WriteGuid("Opponent GUID", guid2);
}
[Parser(Opcode.CMSG_DUEL_PROPOSED)]
public static void HandleDuelProposed(Packet packet)
{
var guid = new byte[8];
packet.StartBitStream(guid, 1, 5, 4, 6, 3, 2, 7, 0);
packet.ParseBitStream(guid, 4, 2, 5, 7, 1, 3, 6, 0);
packet.WriteGuid("Opponent GUID", guid);
}
=======
[Parser(Opcode.SMSG_AI_REACTION)]
public static void HandleAIReaction(Packet packet)
{
var guid = new byte[8];
packet.StartBitStream(guid, 5, 7, 0, 4, 6, 2, 3, 1);
packet.ReadXORByte(guid, 4);
packet.ReadXORByte(guid, 6);
packet.ReadXORByte(guid, 5);
packet.ReadEnum<AIReaction>("Reaction", TypeCode.Int32);
packet.ReadXORByte(guid, 7);
packet.ReadXORByte(guid, 1);
packet.ReadXORByte(guid, 2);
packet.ReadXORByte(guid, 0);
packet.ReadXORByte(guid, 3);
packet.WriteGuid("Guid", guid);
}
[Parser(Opcode.SMSG_ENVIRONMENTALDAMAGELOG)]
public static void HandleEnvirenmentalDamageLog(Packet packet)
{
var guid = new byte[8];
guid[5] = packet.ReadBit();
guid[7] = packet.ReadBit();
guid[1] = packet.ReadBit();
guid[4] = packet.ReadBit();
guid[2] = packet.ReadBit();
guid[0] = packet.ReadBit();
var bit30 = packet.ReadBit();
guid[6] = packet.ReadBit();
guid[3] = packet.ReadBit();
if (bit30)
{
var bits20 = packet.ReadBits(21);
packet.ReadInt32("Int14");
for (var i = 0; i < bits20; ++i)
{
packet.ReadInt32("IntED", i);
packet.ReadInt32("IntED", i);
}
packet.ReadInt32("Int1C");
packet.ReadInt32("Int18");
}
packet.ReadInt32("Int3C");
packet.ReadXORByte(guid, 0);
packet.ReadXORByte(guid, 7);
packet.ReadEnum<EnvironmentDamage>("Type", TypeCode.Byte);
packet.ReadXORByte(guid, 6);
packet.ReadXORByte(guid, 3);
packet.ReadXORByte(guid, 5);
packet.ReadInt32("Int38");
packet.ReadXORByte(guid, 1);
packet.ReadXORByte(guid, 2);
packet.ReadXORByte(guid, 4);
packet.ReadInt32("Damage");
packet.WriteGuid("Guid", guid);
}
>>>>>>>
[Parser(Opcode.SMSG_AI_REACTION)]
public static void HandleAIReaction(Packet packet)
{
var guid = new byte[8];
packet.StartBitStream(guid, 5, 7, 0, 4, 6, 2, 3, 1);
packet.ReadXORByte(guid, 4);
packet.ReadXORByte(guid, 6);
packet.ReadXORByte(guid, 5);
packet.ReadEnum<AIReaction>("Reaction", TypeCode.Int32);
packet.ReadXORByte(guid, 7);
packet.ReadXORByte(guid, 1);
packet.ReadXORByte(guid, 2);
packet.ReadXORByte(guid, 0);
packet.ReadXORByte(guid, 3);
packet.WriteGuid("Guid", guid);
}
[Parser(Opcode.SMSG_ENVIRONMENTALDAMAGELOG)]
public static void HandleEnvirenmentalDamageLog(Packet packet)
{
var guid = new byte[8];
guid[5] = packet.ReadBit();
guid[7] = packet.ReadBit();
guid[1] = packet.ReadBit();
guid[4] = packet.ReadBit();
guid[2] = packet.ReadBit();
guid[0] = packet.ReadBit();
var bit30 = packet.ReadBit();
guid[6] = packet.ReadBit();
guid[3] = packet.ReadBit();
if (bit30)
{
var bits20 = packet.ReadBits(21);
packet.ReadInt32("Int14");
for (var i = 0; i < bits20; ++i)
{
packet.ReadInt32("IntED", i);
packet.ReadInt32("IntED", i);
}
packet.ReadInt32("Int1C");
packet.ReadInt32("Int18");
}
packet.ReadInt32("Int3C");
packet.ReadXORByte(guid, 0);
packet.ReadXORByte(guid, 7);
packet.ReadEnum<EnvironmentDamage>("Type", TypeCode.Byte);
packet.ReadXORByte(guid, 6);
packet.ReadXORByte(guid, 3);
packet.ReadXORByte(guid, 5);
packet.ReadInt32("Int38");
packet.ReadXORByte(guid, 1);
packet.ReadXORByte(guid, 2);
packet.ReadXORByte(guid, 4);
packet.ReadInt32("Damage");
packet.WriteGuid("Guid", guid);
}
[Parser(Opcode.SMSG_CANCEL_AUTO_REPEAT)]
public static void HandleCancelAutoRepeat(Packet packet)
{
var guid = new byte[8];
packet.StartBitStream(guid, 1, 3, 0, 4, 6, 7, 5, 2);
packet.ParseBitStream(guid, 7, 6, 2, 5, 0, 4, 1, 3);
packet.WriteGuid("Guid", guid);
}
[Parser(Opcode.SMSG_DUEL_REQUESTED)]
public static void HandleDuelRequested(Packet packet)
{
var guid1 = new byte[8];
var guid2 = new byte[8];
guid1[5] = packet.ReadBit();
guid2[4] = packet.ReadBit();
guid2[2] = packet.ReadBit();
guid2[7] = packet.ReadBit();
guid1[0] = packet.ReadBit();
guid2[5] = packet.ReadBit();
guid1[4] = packet.ReadBit();
guid1[6] = packet.ReadBit();
guid2[1] = packet.ReadBit();
guid2[3] = packet.ReadBit();
guid2[6] = packet.ReadBit();
guid1[7] = packet.ReadBit();
guid1[3] = packet.ReadBit();
guid1[2] = packet.ReadBit();
guid1[1] = packet.ReadBit();
guid2[0] = packet.ReadBit();
packet.ReadXORByte(guid1, 5);
packet.ReadXORByte(guid1, 3);
packet.ReadXORByte(guid2, 7);
packet.ReadXORByte(guid2, 4);
packet.ReadXORByte(guid1, 7);
packet.ReadXORByte(guid2, 3);
packet.ReadXORByte(guid2, 6);
packet.ReadXORByte(guid2, 0);
packet.ReadXORByte(guid1, 4);
packet.ReadXORByte(guid2, 2);
packet.ReadXORByte(guid2, 1);
packet.ReadXORByte(guid1, 0);
packet.ReadXORByte(guid1, 2);
packet.ReadXORByte(guid1, 6);
packet.ReadXORByte(guid1, 1);
packet.ReadXORByte(guid2, 5);
packet.WriteGuid("Flag GUID", guid1);
packet.WriteGuid("Opponent GUID", guid2);
}
[Parser(Opcode.CMSG_DUEL_PROPOSED)]
public static void HandleDuelProposed(Packet packet)
{
var guid = new byte[8];
packet.StartBitStream(guid, 1, 5, 4, 6, 3, 2, 7, 0);
packet.ParseBitStream(guid, 4, 2, 5, 7, 1, 3, 6, 0);
packet.WriteGuid("Opponent GUID", guid);
} |
<<<<<<<
SpellTargetPositions.Clear();
=======
LocalesQuests.Clear();
LocalesQuestObjectives.Clear();
>>>>>>>
SpellTargetPositions.Clear();
LocalesQuests.Clear();
LocalesQuestObjectives.Clear(); |
<<<<<<<
// ReSharper disable InconsistentNaming
broadcast_text,
=======
// ReSharper disable InconsistentNaming
areatrigger_template,
areatrigger_template_polygon_vertices,
>>>>>>>
// ReSharper disable InconsistentNaming
areatrigger_template,
areatrigger_template_polygon_vertices,
broadcast_text,
<<<<<<<
spell_target_position,
=======
scene_template,
>>>>>>>
scene_template,
spell_target_position, |
<<<<<<<
using PacketParser.Enums;
using PacketParser.Misc;
using PacketParser.Processing;
using PacketParser.DataStructures;
using Guid = PacketParser.DataStructures.Guid;
=======
using WowPacketParser.Enums;
using WowPacketParser.Misc;
using WowPacketParser.Store.Objects;
using Guid=WowPacketParser.Misc.Guid;
using WowPacketParser.Store;
>>>>>>>
using PacketParser.Enums;
using PacketParser.Misc;
using PacketParser.Processing;
using PacketParser.DataStructures;
using Guid = PacketParser.DataStructures.Guid;
<<<<<<<
[Parser(Opcode.SMSG_AUTH_CHALLENGE, ClientVersionBuild.Zero, ClientVersionBuild.V4_2_2_14545)]
=======
[ThreadStatic]
public static Guid LoginGuid;
public static Player LoggedInCharacter;
[Parser(Opcode.SMSG_AUTH_CHALLENGE, ClientVersionBuild.Zero, ClientVersionBuild.V4_0_1a_13205)]
>>>>>>>
[Parser(Opcode.SMSG_AUTH_CHALLENGE, ClientVersionBuild.Zero, ClientVersionBuild.V4_0_1a_13205)]
<<<<<<<
{
packet.StoreBeginList("Server States");
for (var i = 0; i < 8; i++)
=======
{
var SStateCount = ClientVersion.AddedInVersion(ClientVersionBuild.V3_3_5a_12340) ? 8 : 4;
for (var i = 0; i < SStateCount; i++)
>>>>>>>
{
var SStateCount = ClientVersion.AddedInVersion(ClientVersionBuild.V3_3_5a_12340) ? 8 : 4;
packet.StoreBeginList("Server States");
for (var i = 0; i < SStateCount; i++)
<<<<<<<
packet.StoreEndList();
}
=======
}
}
[Parser(Opcode.SMSG_AUTH_CHALLENGE, ClientVersionBuild.V4_0_1a_13205, ClientVersionBuild.V4_0_3_13329)]
public static void HandleServerAuthChallenge401(Packet packet)
{
var keys = new UInt32[2, 4];
packet.ReadUInt32("Key pt3");
packet.ReadUInt32("Key pt5");
packet.ReadByte("Unk Byte");
packet.ReadUInt32("Server Seed");
packet.ReadUInt32("Key pt7");
packet.ReadUInt32("Key pt6");
packet.ReadUInt32("Key pt1");
packet.ReadUInt32("Key pt2");
packet.ReadUInt32("Key pt8");
packet.ReadUInt32("Key pt4");
}
[Parser(Opcode.SMSG_AUTH_CHALLENGE, ClientVersionBuild.V4_0_3_13329, ClientVersionBuild.V4_2_2_14545)]
public static void HandleServerAuthChallenge403(Packet packet)
{
var keys = new UInt32[2, 4];
packet.ReadUInt32("Key pt5");
packet.ReadUInt32("Key pt8");
packet.ReadUInt32("Server Seed");
packet.ReadUInt32("Key pt1");
packet.ReadByte("Unk Byte");
packet.ReadUInt32("Key pt7");
packet.ReadUInt32("Key pt4");
packet.ReadUInt32("Key pt3");
packet.ReadUInt32("Key pt6");
packet.ReadUInt32("Key pt2");
>>>>>>>
packet.StoreEndList();
}
}
[Parser(Opcode.SMSG_AUTH_CHALLENGE, ClientVersionBuild.V4_0_1a_13205, ClientVersionBuild.V4_0_3_13329)]
public static void HandleServerAuthChallenge401(Packet packet)
{
var keys = new UInt32[2, 4];
packet.ReadUInt32("Key pt3");
packet.ReadUInt32("Key pt5");
packet.ReadByte("Unk Byte");
packet.ReadUInt32("Server Seed");
packet.ReadUInt32("Key pt7");
packet.ReadUInt32("Key pt6");
packet.ReadUInt32("Key pt1");
packet.ReadUInt32("Key pt2");
packet.ReadUInt32("Key pt8");
packet.ReadUInt32("Key pt4");
}
[Parser(Opcode.SMSG_AUTH_CHALLENGE, ClientVersionBuild.V4_0_3_13329, ClientVersionBuild.V4_2_2_14545)]
public static void HandleServerAuthChallenge403(Packet packet)
{
var keys = new UInt32[2, 4];
packet.ReadUInt32("Key pt5");
packet.ReadUInt32("Key pt8");
packet.ReadUInt32("Server Seed");
packet.ReadUInt32("Key pt1");
packet.ReadByte("Unk Byte");
packet.ReadUInt32("Key pt7");
packet.ReadUInt32("Key pt4");
packet.ReadUInt32("Key pt3");
packet.ReadUInt32("Key pt6");
packet.ReadUInt32("Key pt2");
<<<<<<<
PacketFileProcessor.Current.GetProcessor<SessionStore>().LoginGuid = packet.StoreBitstreamGuid("GUID", guid);
=======
packet.WriteGuid("Guid", guid);
LoginGuid = new Guid(BitConverter.ToUInt64(guid, 0));
WoWObject character;
if (Storage.Objects.TryGetValue(LoginGuid, out character))
LoggedInCharacter = (Player)character;
>>>>>>>
PacketFileProcessor.Current.GetProcessor<SessionStore>().LoginGuid = packet.StoreBitstreamGuid("GUID", guid); |
<<<<<<<
{Opcode.CMSG_ACTIVATETAXI, 0x03C9},
{Opcode.CMSG_ACTIVATETAXIEXPRESS, 0x06FB},
=======
{Opcode.CMSG_ACTIVATETAXI, 0x03C9},
{Opcode.CMSG_ACTIVATETAXIEXPRESS, 0x06FB},
{Opcode.CMSG_ADD_FRIEND, 0x09A6},
{Opcode.CMSG_ADD_IGNORE, 0x0D20},
{Opcode.CMSG_ALTER_APPEARANCE, 0x07F0},
>>>>>>>
{Opcode.CMSG_ACTIVATETAXI, 0x03C9},
{Opcode.CMSG_ACTIVATETAXIEXPRESS, 0x06FB},
{Opcode.CMSG_ADD_FRIEND, 0x09A6},
{Opcode.CMSG_ADD_IGNORE, 0x0D20},
{Opcode.CMSG_ALTER_APPEARANCE, 0x07F0},
<<<<<<<
{Opcode.CMSG_CANCEL_TRADE, 0x1941},
{Opcode.CMSG_CAST_SPELL, 0x0206},
=======
{Opcode.CMSG_CANCEL_TRADE, 0x1941},
{Opcode.CMSG_CAST_SPELL, 0x0206 | 0x10000},
>>>>>>>
{Opcode.CMSG_CANCEL_TRADE, 0x1941},
{Opcode.CMSG_CAST_SPELL, 0x0206 | 0x10000},
<<<<<<<
{Opcode.CMSG_DUEL_PROPOSED, 0x1A26},
{Opcode.CMSG_DUEL_RESPONSE, 0x03E2},
{Opcode.CMSG_ENABLETAXI, 0x0741},
=======
{Opcode.CMSG_DEL_FRIEND, 0x1103},
{Opcode.CMSG_DEL_IGNORE, 0x0737},
{Opcode.CMSG_DESTROY_ITEM, 0x0026},
{Opcode.CMSG_DUEL_PROPOSED, 0x1A26},
{Opcode.CMSG_EMOTE, 0x1924},
{Opcode.CMSG_ENABLETAXI, 0x0741},
>>>>>>>
{Opcode.CMSG_DEL_FRIEND, 0x1103},
{Opcode.CMSG_DUEL_RESPONSE, 0x03E2},
{Opcode.CMSG_DEL_IGNORE, 0x0737},
{Opcode.CMSG_DESTROY_ITEM, 0x0026},
{Opcode.CMSG_DUEL_PROPOSED, 0x1A26},
{Opcode.CMSG_EMOTE, 0x1924},
{Opcode.CMSG_ENABLETAXI, 0x0741},
<<<<<<<
{Opcode.CMSG_OBJECT_UPDATE_FAILED, 0x1061},
=======
{Opcode.CMSG_OBJECT_UPDATE_FAILED, 0x1061},
{Opcode.CMSG_OFFER_PETITION, 0x15BE},
{Opcode.CMSG_OPENING_CINEMATIC, 0x0130},
{Opcode.CMSG_OPEN_ITEM, 0x1D10},
>>>>>>>
{Opcode.CMSG_OBJECT_UPDATE_FAILED, 0x1061},
{Opcode.CMSG_OFFER_PETITION, 0x15BE},
{Opcode.CMSG_OPENING_CINEMATIC, 0x0130},
{Opcode.CMSG_OPEN_ITEM, 0x1D10},
<<<<<<<
{Opcode.CMSG_PET_ACTION, 0x025B},
=======
{Opcode.CMSG_PETITION_BUY, 0x12D9},
{Opcode.CMSG_PETITION_DECLINE, 0x1279},
{Opcode.CMSG_PETITION_RENAME, 0x1F9A},
{Opcode.CMSG_PETITION_QUERY, 0x0255},
{Opcode.CMSG_PETITION_SHOWLIST, 0x037B},
{Opcode.CMSG_PETITION_SHOW_SIGNATURES, 0x136B},
{Opcode.CMSG_PETITION_SIGN, 0x06DA},
>>>>>>>
{Opcode.CMSG_PETITION_BUY, 0x12D9},
{Opcode.CMSG_PET_ACTION, 0x025B},
{Opcode.CMSG_PETITION_DECLINE, 0x1279},
{Opcode.CMSG_PETITION_RENAME, 0x1F9A},
{Opcode.CMSG_PETITION_QUERY, 0x0255},
{Opcode.CMSG_PETITION_SHOWLIST, 0x037B},
{Opcode.CMSG_PETITION_SHOW_SIGNATURES, 0x136B},
{Opcode.CMSG_PETITION_SIGN, 0x06DA},
<<<<<<<
{Opcode.CMSG_REPOP_REQUEST, 0x134A},
=======
{Opcode.CMSG_REFORGE_ITEM, 0x0C4F},
{Opcode.CMSG_REORDER_CHARACTERS, 0x08A7},
{Opcode.CMSG_REPAIR_ITEM, 0x02C1},
{Opcode.CMSG_REPOP_REQUEST, 0x134A},
{Opcode.CMSG_REQUEST_ACCOUNT_DATA, 0x1D8A},
>>>>>>>
{Opcode.CMSG_REFORGE_ITEM, 0x0C4F},
{Opcode.CMSG_REORDER_CHARACTERS, 0x08A7},
{Opcode.CMSG_REPAIR_ITEM, 0x02C1},
{Opcode.CMSG_REPOP_REQUEST, 0x134A},
{Opcode.CMSG_REQUEST_ACCOUNT_DATA, 0x1D8A},
<<<<<<<
{Opcode.CMSG_SET_TAXI_BENCHMARK_MODE, 0x0762},
=======
{Opcode.CMSG_SET_TAXI_BENCHMARK_MODE, 0x0762},
{Opcode.CMSG_SET_TITLE, 0x03C7},
{Opcode.CMSG_SHOWING_CLOAK, 0x02F2},
{Opcode.CMSG_SHOWING_HELM, 0x126B},
{Opcode.CMSG_SOCKET_GEMS, 0x02CB},
>>>>>>>
{Opcode.CMSG_SET_TAXI_BENCHMARK_MODE, 0x0762},
{Opcode.CMSG_SET_TITLE, 0x03C7},
{Opcode.CMSG_SHOWING_CLOAK, 0x02F2},
{Opcode.CMSG_SHOWING_HELM, 0x126B},
{Opcode.CMSG_SOCKET_GEMS, 0x02CB},
<<<<<<<
{Opcode.CMSG_TAXIQUERYAVAILABLENODES, 0x02E3},
=======
{Opcode.CMSG_SPLIT_ITEM, 0x02EC},
{Opcode.CMSG_SUBMIT_BUG, 0x0861},
{Opcode.CMSG_SUBMIT_COMPLAIN, 0x030D},
{Opcode.CMSG_SUGGESTION_SUBMIT, 0x0A12},
{Opcode.CMSG_SWAP_INV_ITEM, 0x03DF},
{Opcode.CMSG_SWAP_ITEM, 0x035D},
{Opcode.CMSG_TAXIQUERYAVAILABLENODES, 0x02E3},
>>>>>>>
{Opcode.CMSG_SPLIT_ITEM, 0x02EC},
{Opcode.CMSG_SUBMIT_BUG, 0x0861},
{Opcode.CMSG_SUBMIT_COMPLAIN, 0x030D},
{Opcode.CMSG_SUGGESTION_SUBMIT, 0x0A12},
{Opcode.CMSG_SWAP_INV_ITEM, 0x03DF},
{Opcode.CMSG_SWAP_ITEM, 0x035D},
{Opcode.CMSG_TAXIQUERYAVAILABLENODES, 0x02E3},
<<<<<<<
{Opcode.SMSG_ACTIVATETAXIREPLY, 0x02A7},
=======
{Opcode.SMSG_ACTIVATETAXIREPLY, 0x1043},
>>>>>>>
{Opcode.SMSG_ACTIVATETAXIREPLY, 0x02A7},
<<<<<<<
{Opcode.SMSG_CANCEL_AUTO_REPEAT, 0x1E0F},
{Opcode.SMSG_CANCEL_COMBAT, 0x0534},
=======
{Opcode.SMSG_BLACKMARKET_OPEN_RESULT, 0x00AE},
{Opcode.SMSG_BUY_FAILED, 0x1563},
{Opcode.SMSG_BUY_ITEM, 0x101A},
>>>>>>>
{Opcode.SMSG_BLACKMARKET_OPEN_RESULT, 0x00AE},
{Opcode.SMSG_BUY_FAILED, 0x1563},
{Opcode.SMSG_BUY_ITEM, 0x101A},
{Opcode.SMSG_CANCEL_AUTO_REPEAT, 0x1E0F},
{Opcode.SMSG_CANCEL_COMBAT, 0x0534},
<<<<<<<
{Opcode.SMSG_CORPSE_QUERY_RESPONSE, 0x0E0B},
=======
{Opcode.SMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE, 0x1A3A},
{Opcode.SMSG_CORPSE_NOT_IN_INSTANCE, 0x089E},
{Opcode.SMSG_CORPSE_QUERY_RESPONSE, 0x0E0B},
>>>>>>>
{Opcode.SMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE, 0x1A3A},
{Opcode.SMSG_CORPSE_NOT_IN_INSTANCE, 0x089E},
{Opcode.SMSG_CORPSE_QUERY_RESPONSE, 0x0E0B},
<<<<<<<
{Opcode.SMSG_DEATH_RELEASE_LOC, 0x1063},
{Opcode.SMSG_DESTROY_OBJECT, 0x14C2},
{Opcode.SMSG_DUEL_COMPLETE, 0x1C0A},
{Opcode.SMSG_DUEL_COUNTDOWN, 0x129F},
{Opcode.SMSG_DUEL_REQUESTED, 0x0022},
{Opcode.SMSG_DUEL_WINNER, 0x10E1},
{Opcode.SMSG_DUEL_INBOUNDS, 0x163A},
{Opcode.SMSG_DUEL_OUTOFBOUNDS, 0x001A},
=======
{Opcode.SMSG_DEATH_RELEASE_LOC, 0x1063},
{Opcode.SMSG_DEFENSE_MESSAGE, 0x0A1F},
{Opcode.SMSG_DESTROY_OBJECT, 0x14C2 | 0x20000},
>>>>>>>
{Opcode.SMSG_DEATH_RELEASE_LOC, 0x1063},
{Opcode.SMSG_DEFENSE_MESSAGE, 0x0A1F},
{Opcode.SMSG_DESTROY_OBJECT, 0x14C2 | 0x20000},
{Opcode.SMSG_DUEL_COMPLETE, 0x1C0A},
{Opcode.SMSG_DUEL_COUNTDOWN, 0x129F},
{Opcode.SMSG_DUEL_REQUESTED, 0x0022},
{Opcode.SMSG_DUEL_WINNER, 0x10E1},
{Opcode.SMSG_DUEL_INBOUNDS, 0x163A},
{Opcode.SMSG_DUEL_OUTOFBOUNDS, 0x001A},
<<<<<<<
{Opcode.SMSG_NOTIFICATION, 0x12BA},
=======
{Opcode.SMSG_NOTIFICATION, 0x0C2A},
>>>>>>>
{Opcode.SMSG_NOTIFICATION, 0x0C2A},
<<<<<<<
{Opcode.SMSG_SHOWTAXINODES, 0x1E1A},
=======
{Opcode.SMSG_SHOW_BANK, 0x0007},
>>>>>>>
{Opcode.SMSG_SHOWTAXINODES, 0x1E1A},
{Opcode.SMSG_SHOW_BANK, 0x0007},
<<<<<<<
{Opcode.SMSG_STOP_MIRROR_TIMER, 0x1026},
=======
{Opcode.SMSG_START_TIMER, 0x0E3F},
>>>>>>>
{Opcode.SMSG_START_TIMER, 0x0E3F},
<<<<<<<
{Opcode.CMSG_REQUEST_ACCOUNT_DATA, 0x1D8A},
{Opcode.CMSG_SET_ACTION_BUTTON, 0x1F8C},
{Opcode.SMSG_LOG_XPGAIN, 0x1E9A},
{Opcode.CMSG_VOID_STORAGE_QUERY, 0x0140},
{Opcode.CMSG_VOID_STORAGE_TRANSFER, 0x1440 | 0x10000},
{Opcode.CMSG_VOID_STORAGE_UNLOCK, 0x0444},
{Opcode.CMSG_VOID_SWAP_ITEM, 0x0655},
{Opcode.SMSG_VOID_ITEM_SWAP_RESPONSE, 0x1EBF},
{Opcode.SMSG_VOID_STORAGE_CONTENTS, 0x008B},
{Opcode.SMSG_VOID_STORAGE_FAILED, 0x1569},
{Opcode.SMSG_VOID_STORAGE_TRANSFER_CHANGES, 0x14BA},
{Opcode.SMSG_VOID_TRANSFER_RESULT, 0x1C9E},
=======
{Opcode.SMSG_ZONE_UNDER_ATTACK, 0x10C2 | 0x20000},
>>>>>>>
{Opcode.SMSG_ZONE_UNDER_ATTACK, 0x10C2 | 0x20000},
{Opcode.CMSG_REQUEST_ACCOUNT_DATA, 0x1D8A},
{Opcode.CMSG_SET_ACTION_BUTTON, 0x1F8C},
{Opcode.SMSG_LOG_XPGAIN, 0x1E9A},
{Opcode.CMSG_VOID_STORAGE_QUERY, 0x0140},
{Opcode.CMSG_VOID_STORAGE_TRANSFER, 0x1440 | 0x10000},
{Opcode.CMSG_VOID_STORAGE_UNLOCK, 0x0444},
{Opcode.CMSG_VOID_SWAP_ITEM, 0x0655},
{Opcode.SMSG_VOID_ITEM_SWAP_RESPONSE, 0x1EBF},
{Opcode.SMSG_VOID_STORAGE_CONTENTS, 0x008B},
{Opcode.SMSG_VOID_STORAGE_FAILED, 0x1569},
{Opcode.SMSG_VOID_STORAGE_TRANSFER_CHANGES, 0x14BA},
{Opcode.SMSG_VOID_TRANSFER_RESULT, 0x1C9E}, |
<<<<<<<
using mRemoteNG.Themes;
using mRemoteNG.UI.Forms;
using System.Drawing;
=======
>>>>>>>
using mRemoteNG.Themes;
using mRemoteNG.UI.Forms;
using System.Drawing;
<<<<<<<
private WindowType _WindowType;
private DockContent _DockPnl;
private ThemeManager _themeManager;
=======
>>>>>>>
private WindowType _WindowType;
private DockContent _DockPnl;
private ThemeManager _themeManager;
<<<<<<<
public BaseWindow()
{
//InitializeComponent();
}
=======
>>>>>>>
public BaseWindow()
{
//InitializeComponent();
}
<<<<<<<
#region Private Methods
public new void ApplyTheme()
{
if (!Tools.DesignModeTest.IsInDesignMode(this))
{
_themeManager = ThemeManager.getInstance();
if (_themeManager.ThemingActive)
{
this.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
this.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
}
}
}
private void Base_Load(System.Object sender, System.EventArgs e)
{
FrmMain.Default.ShowHidePanelTabs();
=======
#region Private Methods
/*
private void Base_Load(object sender, EventArgs e)
{
FrmMain.Default.ShowHidePanelTabs();
>>>>>>>
#region Private Methods
public new void ApplyTheme()
{
if (!Tools.DesignModeTest.IsInDesignMode(this))
{
_themeManager = ThemeManager.getInstance();
if (_themeManager.ThemingActive)
{
this.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
this.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
}
}
}
#region Private Methods
/*
private void Base_Load(object sender, EventArgs e)
{
FrmMain.Default.ShowHidePanelTabs(); |
<<<<<<<
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Highest")]
public string ConDefaultRdpProtocolVersion {
get {
return ((string)(this["ConDefaultRdpProtocolVersion"]));
}
set {
this["ConDefaultRdpProtocolVersion"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRdpProtocolVersion {
get {
return ((bool)(this["InhDefaultRdpProtocolVersion"]));
}
set {
this["InhDefaultRdpProtocolVersion"] = value;
}
}
=======
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultVmId {
get {
return ((string)(this["ConDefaultVmId"]));
}
set {
this["ConDefaultVmId"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVmId {
get {
return ((bool)(this["InhDefaultVmId"]));
}
set {
this["InhDefaultVmId"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultUseVmId {
get {
return ((bool)(this["InhDefaultUseVmId"]));
}
set {
this["InhDefaultUseVmId"] = value;
}
}
>>>>>>>
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultVmId {
get {
return ((string)(this["ConDefaultVmId"]));
}
set {
this["ConDefaultVmId"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVmId {
get {
return ((bool)(this["InhDefaultVmId"]));
}
set {
this["InhDefaultVmId"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultUseVmId {
get {
return ((bool)(this["InhDefaultUseVmId"]));
}
set {
this["InhDefaultUseVmId"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Highest")]
public string ConDefaultRdpProtocolVersion {
get {
return ((string)(this["ConDefaultRdpProtocolVersion"]));
}
set {
this["ConDefaultRdpProtocolVersion"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRdpProtocolVersion {
get {
return ((bool)(this["InhDefaultRdpProtocolVersion"]));
}
set {
this["InhDefaultRdpProtocolVersion"] = value;
}
} |
<<<<<<<
using System.Linq;
using System.Xml;
=======
using System.Xml;
using System.Xml.Linq;
>>>>>>>
using System.Linq;
using System.Xml;
using System.Xml.Linq; |
<<<<<<<
public bool ShowOnToolbar { get; set; } = true;
=======
public bool RunElevated { get; set; }
>>>>>>>
public bool ShowOnToolbar { get; set; } = true;
public bool RunElevated { get; set; } |
<<<<<<<
this.chkIdentifyQuickConnectTabs.Location = new System.Drawing.Point(3, 118);
=======
this.chkIdentifyQuickConnectTabs.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkIdentifyQuickConnectTabs.Location = new System.Drawing.Point(3, 95);
>>>>>>>
this.chkIdentifyQuickConnectTabs.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkIdentifyQuickConnectTabs.Location = new System.Drawing.Point(3, 118);
<<<<<<<
this.chkOpenNewTabRightOfSelected.Location = new System.Drawing.Point(3, 49);
=======
this.chkOpenNewTabRightOfSelected.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkOpenNewTabRightOfSelected.Location = new System.Drawing.Point(3, 26);
>>>>>>>
this.chkOpenNewTabRightOfSelected.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkOpenNewTabRightOfSelected.Location = new System.Drawing.Point(3, 49);
<<<<<<<
this.chkAlwaysShowPanelSelectionDlg.Location = new System.Drawing.Point(3, 164);
=======
this.chkAlwaysShowPanelSelectionDlg.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkAlwaysShowPanelSelectionDlg.Location = new System.Drawing.Point(3, 141);
>>>>>>>
this.chkAlwaysShowPanelSelectionDlg.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkAlwaysShowPanelSelectionDlg.Location = new System.Drawing.Point(3, 164);
<<<<<<<
this.chkShowLogonInfoOnTabs.Location = new System.Drawing.Point(3, 72);
=======
this.chkShowLogonInfoOnTabs.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkShowLogonInfoOnTabs.Location = new System.Drawing.Point(3, 49);
>>>>>>>
this.chkShowLogonInfoOnTabs.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkShowLogonInfoOnTabs.Location = new System.Drawing.Point(3, 72);
<<<<<<<
this.chkDoubleClickClosesTab.Location = new System.Drawing.Point(3, 141);
=======
this.chkDoubleClickClosesTab.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkDoubleClickClosesTab.Location = new System.Drawing.Point(3, 118);
>>>>>>>
this.chkDoubleClickClosesTab.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkDoubleClickClosesTab.Location = new System.Drawing.Point(3, 141);
<<<<<<<
this.chkShowProtocolOnTabs.Location = new System.Drawing.Point(3, 95);
=======
this.chkShowProtocolOnTabs.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkShowProtocolOnTabs.Location = new System.Drawing.Point(3, 72);
>>>>>>>
this.chkShowProtocolOnTabs.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkShowProtocolOnTabs.Location = new System.Drawing.Point(3, 95);
<<<<<<<
this.chkCreateEmptyPanelOnStart.Location = new System.Drawing.Point(3, 187);
=======
this.chkCreateEmptyPanelOnStart.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkCreateEmptyPanelOnStart.Location = new System.Drawing.Point(3, 164);
>>>>>>>
this.chkCreateEmptyPanelOnStart.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkCreateEmptyPanelOnStart.Location = new System.Drawing.Point(3, 187); |
<<<<<<<
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
=======
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
>>>>>>>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
<<<<<<<
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool AlwaysShowConnectionTabs {
get {
return ((bool)(this["AlwaysShowConnectionTabs"]));
}
set {
this["AlwaysShowConnectionTabs"] = value;
}
}
=======
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool TrackActiveConnectionInConnectionTree {
get {
return ((bool)(this["TrackActiveConnectionInConnectionTree"]));
}
set {
this["TrackActiveConnectionInConnectionTree"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool PlaceSearchBarAboveConnectionTree {
get {
return ((bool)(this["PlaceSearchBarAboveConnectionTree"]));
}
set {
this["PlaceSearchBarAboveConnectionTree"] = value;
}
}
>>>>>>>
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool TrackActiveConnectionInConnectionTree {
get {
return ((bool)(this["TrackActiveConnectionInConnectionTree"]));
}
set {
this["TrackActiveConnectionInConnectionTree"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool PlaceSearchBarAboveConnectionTree {
get {
return ((bool)(this["PlaceSearchBarAboveConnectionTree"]));
}
set {
this["PlaceSearchBarAboveConnectionTree"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool AlwaysShowConnectionTabs {
get {
return ((bool)(this["AlwaysShowConnectionTabs"]));
}
set {
this["AlwaysShowConnectionTabs"] = value;
}
} |
<<<<<<<
using System.Windows.Forms;
=======
>>>>>>>
<<<<<<<
_startupDataLogger.Execute();
CompatibilityChecker.CheckCompatibility();
ParseCommandLineArgs();
=======
var startupLogger = new StartupDataLogger(messageCollector);
startupLogger.LogStartupData();
CompatibilityChecker.CheckCompatibility(messageCollector);
ParseCommandLineArgs(messageCollector);
>>>>>>>
var startupLogger = new StartupDataLogger(messageCollector);
startupLogger.LogStartupData();
CompatibilityChecker.CheckCompatibility(messageCollector);
ParseCommandLineArgs(messageCollector);
<<<<<<<
public void CreateConnectionsProvider()
=======
private static void ParseCommandLineArgs(MessageCollector messageCollector)
{
var interpreter = new StartupArgumentsInterpreter(messageCollector);
interpreter.ParseArguments(Environment.GetCommandLineArgs());
}
private static void GetConnectionIcons()
{
var iPath = GeneralAppInfo.HomePath + "\\Icons\\";
if (Directory.Exists(iPath) == false)
{
return;
}
foreach (var f in Directory.GetFiles(iPath, "*.ico", SearchOption.AllDirectories))
{
var fInfo = new FileInfo(f);
Array.Resize(ref ConnectionIcon.Icons, ConnectionIcon.Icons.Length + 1);
ConnectionIcon.Icons.SetValue(fInfo.Name.Replace(".ico", ""), ConnectionIcon.Icons.Length - 1);
}
}
public void CreateConnectionsProvider(MessageCollector messageCollector)
>>>>>>>
private static void ParseCommandLineArgs(MessageCollector messageCollector)
{
var interpreter = new StartupArgumentsInterpreter(messageCollector);
interpreter.ParseArguments(Environment.GetCommandLineArgs());
}
private static void GetConnectionIcons()
{
var iPath = GeneralAppInfo.HomePath + "\\Icons\\";
if (Directory.Exists(iPath) == false)
{
return;
}
foreach (var f in Directory.GetFiles(iPath, "*.ico", SearchOption.AllDirectories))
{
var fInfo = new FileInfo(f);
Array.Resize(ref ConnectionIcon.Icons, ConnectionIcon.Icons.Length + 1);
ConnectionIcon.Icons.SetValue(fInfo.Name.Replace(".ico", ""), ConnectionIcon.Icons.Length - 1);
}
}
public void CreateConnectionsProvider(MessageCollector messageCollector)
<<<<<<<
Runtime.MessageCollector.AddExceptionMessage("GetUpdateInfoCompleted() failed.", ex, MessageClass.ErrorMsg, true);
}
}
private static void ParseCommandLineArgs()
{
try
{
var cmd = new CmdArgumentsInterpreter(Environment.GetCommandLineArgs());
var ConsParam = "";
if (cmd["cons"] != null)
{
ConsParam = "cons";
}
if (cmd["c"] != null)
{
ConsParam = "c";
}
var ResetPosParam = "";
if (cmd["resetpos"] != null)
{
ResetPosParam = "resetpos";
}
if (cmd["rp"] != null)
{
ResetPosParam = "rp";
}
var ResetPanelsParam = "";
if (cmd["resetpanels"] != null)
{
ResetPanelsParam = "resetpanels";
}
if (cmd["rpnl"] != null)
{
ResetPanelsParam = "rpnl";
}
var ResetToolbarsParam = "";
if (cmd["resettoolbar"] != null)
{
ResetToolbarsParam = "resettoolbar";
}
if (cmd["rtbr"] != null)
{
ResetToolbarsParam = "rtbr";
}
if (cmd["reset"] != null)
{
ResetPosParam = "rp";
ResetPanelsParam = "rpnl";
ResetToolbarsParam = "rtbr";
}
var NoReconnectParam = "";
if (cmd["noreconnect"] != null)
{
NoReconnectParam = "noreconnect";
}
if (cmd["norc"] != null)
{
NoReconnectParam = "norc";
}
if (!string.IsNullOrEmpty(ConsParam))
{
if (File.Exists(cmd[ConsParam]) == false)
{
if (File.Exists(GeneralAppInfo.HomePath + "\\" + cmd[ConsParam]))
{
Settings.Default.LoadConsFromCustomLocation = true;
Settings.Default.CustomConsPath = GeneralAppInfo.HomePath + "\\" + cmd[ConsParam];
return;
}
if (File.Exists(ConnectionsFileInfo.DefaultConnectionsPath + "\\" + cmd[ConsParam]))
{
Settings.Default.LoadConsFromCustomLocation = true;
Settings.Default.CustomConsPath = ConnectionsFileInfo.DefaultConnectionsPath + "\\" + cmd[ConsParam];
return;
}
}
else
{
Settings.Default.LoadConsFromCustomLocation = true;
Settings.Default.CustomConsPath = cmd[ConsParam];
return;
}
}
if (!string.IsNullOrEmpty(ResetPosParam))
{
Settings.Default.MainFormKiosk = false;
Settings.Default.MainFormLocation = new Point(999, 999);
Settings.Default.MainFormSize = new Size(900, 600);
Settings.Default.MainFormState = FormWindowState.Normal;
}
if (!string.IsNullOrEmpty(ResetPanelsParam))
{
Settings.Default.ResetPanels = true;
}
if (!string.IsNullOrEmpty(NoReconnectParam))
{
Settings.Default.NoReconnect = true;
}
if (!string.IsNullOrEmpty(ResetToolbarsParam))
{
Settings.Default.ResetToolbars = true;
}
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strCommandLineArgsCouldNotBeParsed + Environment.NewLine + ex.Message);
=======
Runtime.MessageCollector.AddExceptionMessage("GetUpdateInfoCompleted() failed.", ex);
>>>>>>>
Runtime.MessageCollector.AddExceptionMessage("GetUpdateInfoCompleted() failed.", ex); |
<<<<<<<
private MultiSSHController _multiSSHController ;
=======
>>>>>>>
private MultiSSHController _multiSSHController ; |
<<<<<<<
private static string GetRoleName()
{
return RoleEnvironment.GetConfigurationSettingValue(Constants.ReplicaSetNameSetting);
}
=======
>>>>>>> |
<<<<<<<
[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameAuthenticationLevel)),
LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionAuthenticationLevel)),
=======
[LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.EncryptionStrength)),
LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionEncryptionStrength)),
TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
public bool ICAEncryptionStrength { get; set; }
[LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.AuthenticationLevel)),
LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionAuthenticationLevel)),
>>>>>>>
[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.AuthenticationLevel)),
LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionAuthenticationLevel)), |
<<<<<<<
connectionInfo.RdpProtocolVersion = xmlnode.GetAttributeAsEnum("RdpProtocolVersion", RdpVersion.Highest);
connectionInfo.Inheritance.RdpProtocolVersion = xmlnode.GetAttributeAsBool("InheritRdpProtocolVersion");
=======
connectionInfo.Inheritance.UseVmId = xmlnode.GetAttributeAsBool("InheritUseVmId");
connectionInfo.Inheritance.VmId = xmlnode.GetAttributeAsBool("InheritVmId");
>>>>>>>
connectionInfo.RdpProtocolVersion = xmlnode.GetAttributeAsEnum("RdpProtocolVersion", RdpVersion.Highest);
connectionInfo.Inheritance.RdpProtocolVersion = xmlnode.GetAttributeAsBool("InheritRdpProtocolVersion");
connectionInfo.Inheritance.UseVmId = xmlnode.GetAttributeAsBool("InheritUseVmId");
connectionInfo.Inheritance.VmId = xmlnode.GetAttributeAsBool("InheritVmId"); |
<<<<<<<
var pages = new UserControl[]
=======
var credentialManagerForm = new CredentialManagerForm(CredentialManager)
>>>>>>>
var pages = new UserControl[]
<<<<<<<
var credentialManagerForm = new CredentialManagerForm(pages);
credentialManagerForm.CenterOnTarget(_form);
=======
credentialManagerForm.CenterOnTarget(MainForm);
>>>>>>>
var credentialManagerForm = new CredentialManagerForm(pages);
credentialManagerForm.CenterOnTarget(MainForm); |
<<<<<<<
using AspNetCore.Identity.MongoDbCore.Models;
using Microsoft.AspNetCore.Identity;
using AspNetCore.Identity.MongoDbCore.Infrastructure;
using Microsoft.Extensions.Hosting;
=======
using System;
using Microsoft.Extensions.Logging;
>>>>>>>
using Microsoft.Extensions.Logging;
using System;
<<<<<<<
public Startup(IWebHostEnvironment env)
=======
const string DevEnvironmentName = "Development";
public Startup(IWebHostEnvironment env)
>>>>>>>
public Startup(IWebHostEnvironment env)
<<<<<<<
.SetBasePath(env.ContentRootPath)
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
//per user config that is not committed to repo, use this to override settings (e.g. connection string) based on your local environment.
.AddJsonFile($"appsettings.local.json", optional: true);
=======
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
>>>>>>>
.SetBasePath(env.ContentRootPath)
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
//per user config that is not committed to repo, use this to override settings (e.g. connection string) based on your local environment.
.AddJsonFile($"appsettings.local.json", optional: true);
<<<<<<<
services.AddApplicationInsightsTelemetry();
=======
//services.AddAuthentication(o =>
//{
// o.DefaultScheme = IdentityConstants.ApplicationScheme;
// o.DefaultSignInScheme = IdentityConstants.ExternalScheme;
//})
//.AddIdentityCookies(o => { });
>>>>>>>
services.AddApplicationInsightsTelemetry();
<<<<<<<
public void Configure(IApplicationBuilder app, IWebHostEnvironment env) //, ILoggerFactory loggerFactory)
=======
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
>>>>>>>
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
<<<<<<<
// Add external authentication middleware below. To configure them please see https://go.microsoft.com/fwlink/?LinkID=532715
=======
>>>>>>> |
<<<<<<<
namespace Nancy.Demo
{
using Nancy.Demo.Models;
using Nancy.Formatters;
using Nancy.ViewEngines;
using Nancy.ViewEngines.NDjango;
using Nancy.ViewEngines.NHaml;
using Nancy.ViewEngines.Razor;
=======
using Nancy.Demo.Models;
using Nancy.Formatters;
using Nancy.ViewEngines.Razor;
>>>>>>>
namespace Nancy.Demo
{
using Nancy.Demo.Models;
using Nancy.Formatters;
using Nancy.ViewEngines;
using Nancy.ViewEngines.NDjango;
using Nancy.ViewEngines.NHaml;
using Nancy.ViewEngines.Razor;
<<<<<<<
Get["/nhaml"] = x => {
var model = new RatPack { FirstName = "Andrew" };
return View.Haml("~/views/nhaml.haml", model);
};
Get["/ndjango"] = x => {
var model = new RatPack { FirstName = "Michael" };
return View.Django("~/views/ndjango.django", model);
};
Get["/json"] = x => {
var model = new RatPack { FirstName = "Frank" };
return Response.AsJson(model);
};
=======
Get["/json"] = x => {
var model = new RatPack { FirstName = "Frank" };
return Response.AsJson(model);
};
Get["/xml"] = x =>
{
var model = new RatPack { FirstName = "Frank" };
return Response.AsXml(model);
};
>>>>>>>
Get["/nhaml"] = x => {
var model = new RatPack { FirstName = "Andrew" };
return View.Haml("~/views/nhaml.haml", model);
};
Get["/ndjango"] = x => {
var model = new RatPack { FirstName = "Michael" };
return View.Django("~/views/ndjango.django", model);
};
Get["/json"] = x => {
var model = new RatPack { FirstName = "Frank" };
return Response.AsJson(model);
};
Get["/xml"] = x => {
var model = new RatPack { FirstName = "Frank" };
return Response.AsXml(model);
}; |
<<<<<<<
=======
using System.Runtime.InteropServices;
>>>>>>>
<<<<<<<
[assembly: AssemblyVersion("0.0.0")]
=======
[assembly: AssemblyVersion("0.6.0")]
>>>>>>>
[assembly: AssemblyVersion("0.0.0")] |
<<<<<<<
var serializer = new JavaScriptSerializer(null, false, JsonSettings.MaxJsonLength, JsonSettings.MaxRecursions);
serializer.RegisterConverters(JsonSettings.Converters, JsonSettings.PrimitiveConverters);
=======
var serializer = new JavaScriptSerializer(null, false, JsonSettings.MaxJsonLength, JsonSettings.MaxRecursions, JsonSettings.RetainCasing, JsonSettings.ISO8601DateFormat);
serializer.RegisterConverters(JsonSettings.Converters);
>>>>>>>
var serializer = new JavaScriptSerializer(null, false, JsonSettings.MaxJsonLength, JsonSettings.MaxRecursions, JsonSettings.RetainCasing, JsonSettings.ISO8601DateFormat);
serializer.RegisterConverters(JsonSettings.Converters, JsonSettings.PrimitiveConverters); |
<<<<<<<
// TestCodeElements.Check_NOTCodeElements();
// TestCodeElements.Check_ONCodeElements();
// TestCodeElements.Check_PERFORMCodeElements();
=======
//TODO TestCodeElements.Check_NOTCodeElements();
//TODO TestCodeElements.Check_ONCodeElements();
TestCodeElements.Check_PERFORMCodeElements();
>>>>>>>
//TODO TestCodeElements.Check_NOTCodeElements();
//TODO TestCodeElements.Check_ONCodeElements();
//TODO TestCodeElements.Check_PERFORMCodeElements(); |
<<<<<<<
da.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase),
SymbolTable.Scope.GlobalStorage);
=======
da.Name.StartsWith(userFilterText,
StringComparison
.InvariantCultureIgnoreCase), SymbolTable.Scope.Global);
>>>>>>>
da.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase),
SymbolTable.Scope.GlobalStorage);
<<<<<<<
p.Name.Equals(procedureName) ||
p.VisualQualifiedName.ToString().Equals(procedureName),
SymbolTable.Scope.Intrinsic
);
=======
p.Name.Equals(procedureName, StringComparison.InvariantCultureIgnoreCase) ||
p.VisualQualifiedName.ToString().Equals(procedureName, StringComparison.InvariantCultureIgnoreCase), new List<SymbolTable.Scope>
{
SymbolTable.Scope.Declarations,
SymbolTable.Scope.Intrinsic,
SymbolTable.Scope.Namespace
});
>>>>>>>
p.Name.Equals(procedureName, StringComparison.InvariantCultureIgnoreCase) ||
p.VisualQualifiedName.ToString().Equals(procedureName, StringComparison.InvariantCultureIgnoreCase),
SymbolTable.Scope.Intrinsic
);
<<<<<<<
potentialVariablesForCompletion = node.SymbolTable.GetVariablesByType(parameterToFill.DataType, potentialVariablesForCompletion, SymbolTable.Scope.GlobalStorage);
=======
potentialVariablesForCompletion = node.SymbolTable.GetVariablesByType(parameterToFill.DataType, potentialVariablesForCompletion, SymbolTable.Scope.Global);
>>>>>>>
potentialVariablesForCompletion = node.SymbolTable.GetVariablesByType(parameterToFill.DataType, potentialVariablesForCompletion, SymbolTable.Scope.GlobalStorage);
<<<<<<<
if (node?.SymbolTable != null)
{
var userFilterText = userFilterToken == null ? string.Empty : userFilterToken.Text;
types =
node.SymbolTable.GetTypes(
t => t.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase)
||
(!t.IsFlagSet(Node.Flag.NodeIsIntrinsic) &&
t.VisualQualifiedName.ToString()
.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase)),
SymbolTable.Scope.Intrinsic
);
}
=======
var userFilterText = userFilterToken == null ? string.Empty : userFilterToken.Text;
types =
node.SymbolTable.GetTypes(
t => t.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase)
||
(!t.IsFlagSet(Node.Flag.NodeIsIntrinsic) &&
t.VisualQualifiedName.ToString()
.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase)),
new List<SymbolTable.Scope>
{
SymbolTable.Scope.Declarations,
SymbolTable.Scope.Global,
SymbolTable.Scope.Intrinsic,
SymbolTable.Scope.Namespace
});
>>>>>>>
var userFilterText = userFilterToken == null ? string.Empty : userFilterToken.Text;
types =
node.SymbolTable.GetTypes(
t => t.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase)
||
(!t.IsFlagSet(Node.Flag.NodeIsIntrinsic) &&
t.VisualQualifiedName.ToString()
.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase)),
SymbolTable.Scope.Intrinsic
);
<<<<<<<
var variables = node.SymbolTable.GetVariables(predicate, SymbolTable.Scope.GlobalStorage);
=======
var variables = node.SymbolTable.GetVariables(predicate, SymbolTable.Scope.Global);
>>>>>>>
var variables = node.SymbolTable.GetVariables(predicate, SymbolTable.Scope.GlobalStorage);
<<<<<<<
potentialVariables = node.SymbolTable.GetVariablesByType(seekedDataType, potentialVariables, SymbolTable.Scope.GlobalStorage);
=======
foreach (var seekedDataType in seekedDataTypes.Distinct())
{
potentialVariables = node.SymbolTable.GetVariablesByType(seekedDataType, potentialVariables, SymbolTable.Scope.Global);
}
>>>>>>>
foreach (var seekedDataType in seekedDataTypes.Distinct())
{
potentialVariables = node.SymbolTable.GetVariablesByType(seekedDataType, potentialVariables, SymbolTable.Scope.Global);
}
potentialVariables = node.SymbolTable.GetVariablesByType(seekedDataType, potentialVariables, SymbolTable.Scope.GlobalStorage);
<<<<<<<
potentialVariables = node.SymbolTable.GetVariables(variablePredicate,SymbolTable.Scope.GlobalStorage);
=======
potentialVariables = node.SymbolTable.GetVariables(variablePredicate, SymbolTable.Scope.Global);
>>>>>>>
potentialVariables = node.SymbolTable.GetVariables(variablePredicate,SymbolTable.Scope.GlobalStorage);
<<<<<<<
&& v.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase),
SymbolTable.Scope.GlobalStorage);
=======
&& v.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase), SymbolTable.Scope.Global);
>>>>>>>
&& v.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase),
SymbolTable.Scope.GlobalStorage);
<<<<<<<
&& v.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase),
SymbolTable.Scope.GlobalStorage);
=======
&& v.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase), SymbolTable.Scope.Global);
>>>>>>>
&& v.Name.StartsWith(userFilterText, StringComparison.InvariantCultureIgnoreCase),
SymbolTable.Scope.GlobalStorage); |
<<<<<<<
using System.Reflection;
=======
using Jabbot.Sprockets.Core;
using SignalR.Client.Hubs;
using SignalR.Client.Transports;
using JabbR.Client;
using JabbR.Client.Models;
>>>>>>>
using System.Reflection;
using JabbR.Client;
using JabbR.Client.Models;
<<<<<<<
private const string ExtensionsFolder = "Sprockets";
private readonly string _password = string.Empty;
private readonly string _url = string.Empty;
private JabbRClient _client;
=======
private readonly string _password;
private readonly string _url;
>>>>>>>
private const string ExtensionsFolder = "Sprockets";
private readonly string _password = string.Empty;
private readonly string _url = string.Empty;
private JabbRClient _client;
<<<<<<<
private bool _isActive = false;
private bool _containerInitialized = false;
=======
JabbRClient client;
private bool isActive = false;
>>>>>>>
private bool _isActive = false;
private bool _containerInitialized = false;
private bool isActive = false;
<<<<<<<
InitializeClient();
CreateCompositionContainer();
InitializeContainer();
}
private void InitializeClient()
{
_client = new JabbRClient(_url);
_client.MessageReceived += (message, room) =>
{
ProcessMessage(message, room);
};
=======
_url = url;
//_connection = new HubConnection(url);
//_chat = _connection.CreateProxy("JabbR.Chat");
>>>>>>>
//_chat = _connection.CreateProxy("JabbR.Chat");
InitializeClient();
CreateCompositionContainer();
InitializeContainer();
}
private void InitializeClient()
{
_client = new JabbRClient(_url);
_client.MessageReceived += (message, room) =>
{
ProcessMessage(message, room);
};
<<<<<<<
get { throw new NotImplementedException(); }
=======
get
{
return client.Credentials;
}
set
{
client.Credentials = value;
}
>>>>>>>
get { throw new NotImplementedException(); }
<<<<<<<
_client.Disconnected += value;
=======
client.Disconnected += value;
>>>>>>>
_client.Disconnected += value;
<<<<<<<
_client.Disconnected -= value;
=======
client.Disconnected -= value;
>>>>>>>
_client.Disconnected -= value;
<<<<<<<
_client.JoinRoom(room);
=======
if (what == null)
{
throw new ArgumentNullException("what");
}
if (what.StartsWith("/"))
{
throw new InvalidOperationException("Commands are not allowed");
}
if (string.IsNullOrWhiteSpace(room))
{
throw new ArgumentNullException("room");
}
client.Send(what, room);
>>>>>>>
_client.JoinRoom(room);
// _connection.Start(new AutoTransport()).Wait();
// // Join the chat
// var success = _chat.Invoke<bool>("Join").Result;
// if (!success)
// {
// // Setup the name of the bot
// Send(String.Format("/nick {0} {1}", Name, _password));
// IntializeSprockets();
// }
//}
<<<<<<<
_client.SendPrivateMessage(toName, message);
=======
if (who == null)
{
throw new ArgumentNullException("who");
}
if (what == null)
{
throw new ArgumentNullException("what");
}
client.SendPrivateMessage(who, what);
>>>>>>>
_client.SendPrivateMessage(toName, message);
<<<<<<<
=======
>>>>>>> |
<<<<<<<
=======
// Check if a dictionary item has been assigned
if (propertyValue == null || propertyValue.ToString().IsNullOrWhiteSpace())
{
var dictionaryValueAttr = propertyInfo.GetCustomAttribute<UmbracoDictionaryValueAttribute>();
if (dictionaryValueAttr != null && !dictionaryValueAttr.DictionaryKey.IsNullOrWhiteSpace())
{
propertyValue = ConverterHelper.UmbracoHelper.GetDictionaryValue(dictionaryValueAttr.DictionaryKey);
}
}
>>>>>>>
<<<<<<<
// This contains the IPublishedContent and the currently converting property name.
var culture = UmbracoContext.Current.PublishedContentRequest.Culture;
var context = new PublishedContentContext(content, actualPropertyName);
object converted = converter.ConvertFrom(context, culture, propertyValue);
=======
// This contains the IPublishedContent and the currently converting property descriptor.
var descriptor = TypeDescriptor.GetProperties(instance)[propertyInfo.Name];
var context = new PublishedContentContext(content, descriptor);
object converted = converter.ConvertFrom(context, CultureInfo.CurrentCulture, propertyValue);
>>>>>>>
// This contains the IPublishedContent and the currently converting property descriptor.
var culture = UmbracoContext.Current.PublishedContentRequest.Culture;
var descriptor = TypeDescriptor.GetProperties(instance)[propertyInfo.Name];
var context = new PublishedContentContext(content, descriptor);
object converted = converter.ConvertFrom(context, culture, propertyValue);
<<<<<<<
var culture = UmbracoContext.Current.PublishedContentRequest.Culture;
var context = new PublishedContentContext(content, actualPropertyName);
propertyInfo.SetValue(instance, converter.ConvertFrom(context, culture, propertyValue), null);
=======
// This contains the IPublishedContent and the currently converting property descriptor.
var descriptor = TypeDescriptor.GetProperties(instance)[propertyInfo.Name];
var context = new PublishedContentContext(content, descriptor);
propertyInfo.SetValue(instance, converter.ConvertFrom(context, CultureInfo.CurrentCulture, propertyValue), null);
>>>>>>>
// This contains the IPublishedContent and the currently converting property descriptor.
var culture = UmbracoContext.Current.PublishedContentRequest.Culture;
var descriptor = TypeDescriptor.GetProperties(instance)[propertyInfo.Name];
var context = new PublishedContentContext(content, descriptor);
propertyInfo.SetValue(instance, converter.ConvertFrom(context, culture, propertyValue), null); |
<<<<<<<
// This contains the IPublishedContent and the currently converting property name.
var context = new PublishedContentContext(content, actualPropertyName);
=======
// This contains the IPublishedContent and the currently converting property descriptor.
var culture = UmbracoContext.Current.PublishedContentRequest.Culture;
var descriptor = TypeDescriptor.GetProperties(instance)[propertyInfo.Name];
var context = new PublishedContentContext(content, descriptor);
>>>>>>>
// This contains the IPublishedContent and the currently converting property descriptor.
var descriptor = TypeDescriptor.GetProperties(instance)[propertyInfo.Name];
var context = new PublishedContentContext(content, descriptor);
<<<<<<<
var context = new PublishedContentContext(content, actualPropertyName);
=======
// This contains the IPublishedContent and the currently converting property descriptor.
var culture = UmbracoContext.Current.PublishedContentRequest.Culture;
var descriptor = TypeDescriptor.GetProperties(instance)[propertyInfo.Name];
var context = new PublishedContentContext(content, descriptor);
>>>>>>>
// This contains the IPublishedContent and the currently converting property descriptor.
var descriptor = TypeDescriptor.GetProperties(instance)[propertyInfo.Name];
var context = new PublishedContentContext(content, descriptor); |
<<<<<<<
CultureInfo culture,
object instance,
Action<DittoConversionHandlerContext> onConverting,
Action<DittoConversionHandlerContext> onConverted,
DittoChainContext chainContext)
=======
IDittoContextAccessor contextAccessor,
CultureInfo culture = null,
object instance = null,
IEnumerable<DittoProcessorContext> processorContexts = null,
Action<DittoConversionHandlerContext> onConverting = null,
Action<DittoConversionHandlerContext> onConverted = null)
>>>>>>>
IDittoContextAccessor contextAccessor,
CultureInfo culture = null,
object instance = null,
IEnumerable<DittoProcessorContext> processorContexts = null,
Action<DittoConversionHandlerContext> onConverting = null,
Action<DittoConversionHandlerContext> onConverted = null,
DittoChainContext chainContext = null)
<<<<<<<
lazyProperties.Add(propertyInfo.Name, new Lazy<object>(() => GetProcessedValue(content, culture, type, deferredPropertyInfo, localInstance, defaultProcessorType, chainContext)));
=======
lazyProperties.Add(propertyInfo.Name, new Lazy<object>(() => GetProcessedValue(content, culture, type, deferredPropertyInfo, localInstance, defaultProcessorType, contextAccessor, processorContexts)));
>>>>>>>
lazyProperties.Add(propertyInfo.Name, new Lazy<object>(() => GetProcessedValue(content, culture, type, deferredPropertyInfo, localInstance, defaultProcessorType, contextAccessor, processorContexts, chainContext)));
<<<<<<<
var value = GetProcessedValue(content, culture, type, propertyInfo, instance, defaultProcessorType, chainContext);
=======
var value = GetProcessedValue(content, culture, type, propertyInfo, instance, defaultProcessorType, contextAccessor, processorContexts);
>>>>>>>
var value = GetProcessedValue(content, culture, type, propertyInfo, instance, defaultProcessorType, contextAccessor, processorContexts, chainContext);
<<<<<<<
/// <param name="chainContext">The <see cref="DittoChainContext"/> for the current processor chain.</param>
=======
/// <param name="contextAccessor">The context accessor.</param>
/// <param name="processorContexts">A collection of <see cref="DittoProcessorContext" /> entities to use whilst processing values.</param>
>>>>>>>
/// <param name="contextAccessor">The context accessor.</param>
/// <param name="processorContexts">A collection of <see cref="DittoProcessorContext" /> entities to use whilst processing values.</param>
/// <param name="chainContext">The <see cref="DittoChainContext"/> for the current processor chain.</param>
<<<<<<<
DittoChainContext chainContext)
=======
IDittoContextAccessor contextAccessor,
IEnumerable<DittoProcessorContext> processorContexts = null)
>>>>>>>
IDittoContextAccessor contextAccessor,
IEnumerable<DittoProcessorContext> processorContexts = null,
DittoChainContext chainContext = null)
<<<<<<<
/// <param name="baseProcessorContext">The base processor context.</param>
/// <param name="chainContext">The <see cref="DittoChainContext"/> for the current processor chain.</param>
=======
/// <param name="contextAccessor">The context accessor.</param>
/// <param name="processorContexts">The processor contexts.</param>
>>>>>>>
/// <param name="contextAccessor">The context accessor.</param>
/// <param name="processorContexts">The processor contexts.</param>
/// <param name="baseProcessorContext">The base processor context.</param>
/// <param name="chainContext">The <see cref="DittoChainContext"/> for the current processor chain.</param>
<<<<<<<
DittoProcessorContext baseProcessorContext,
DittoChainContext chainContext)
=======
IDittoContextAccessor contextAccessor,
IEnumerable<DittoProcessorContext> processorContexts = null)
>>>>>>>
IDittoContextAccessor contextAccessor,
IEnumerable<DittoProcessorContext> processorContexts = null,
DittoProcessorContext baseProcessorContext = null,
DittoChainContext chainContext = null) |
<<<<<<<
Action<DittoConversionHandlerContext> onConverting = null,
Action<DittoConversionHandlerContext> onConverted = null,
CultureInfo culture = null)
=======
Action<ConvertingTypeEventArgs> convertingType = null,
Action<ConvertedTypeEventArgs> convertedType = null,
CultureInfo culture = null,
object instance = null)
>>>>>>>
Action<DittoConversionHandlerContext> onConverting = null,
Action<DittoConversionHandlerContext> onConverted = null,
CultureInfo culture = null,
object instance = null)
<<<<<<<
return ConvertContent(content, type, onConverting, onConverted, culture);
=======
// Check for and fire any event args
var convertingArgs = new ConvertingTypeEventArgs
{
Content = content
};
DittoEventHandlers.CallConvertingTypeHandler(convertingArgs);
if (!convertingArgs.Cancel && convertingType != null)
{
convertingType(convertingArgs);
}
// Cancel if applicable.
if (convertingArgs.Cancel)
{
return null;
}
// Get the object as the type.
instance = GetTypedProperty(content, type, culture, instance);
// Fire the converted event
var convertedArgs = new ConvertedTypeEventArgs
{
Content = content,
Converted = instance,
ConvertedType = type
};
if (convertedType != null)
{
convertedType(convertedArgs);
}
DittoEventHandlers.CallConvertedTypeHandler(convertedArgs);
return convertedArgs.Converted;
>>>>>>>
return ConvertContent(content, type, onConverting, onConverted, culture, instance);
<<<<<<<
Action<DittoConversionHandlerContext> onConverting = null,
Action<DittoConversionHandlerContext> onConverted = null,
CultureInfo culture = null)
=======
CultureInfo culture = null,
object instance = null)
>>>>>>>
Action<DittoConversionHandlerContext> onConverting = null,
Action<DittoConversionHandlerContext> onConverted = null,
CultureInfo culture = null,
object instance = null) |
<<<<<<<
string snapshot;
if (queryParameters.TryGetValue(Constants.QueryConstants.ShareSnapshot, out snapshot))
{
if (!string.IsNullOrEmpty(snapshot))
{
parsedShareSnapshot = ParseSnapshotTime(snapshot);
}
}
=======
>>>>>>> |
<<<<<<<
typeof (ClusterResponseParser<>),
typeof (TermsResponseParser<>)
=======
typeof (ClusterResponseParser<>),
typeof (InterestingTermsResponseParser<>),
typeof (MoreLikeThisHandlerMatchResponseParser<>),
>>>>>>>
typeof (ClusterResponseParser<>),
typeof (TermsResponseParser<>)
typeof (InterestingTermsResponseParser<>),
typeof (MoreLikeThisHandlerMatchResponseParser<>),
<<<<<<<
typeof (ClusterResponseParser<>),
typeof (TermsResponseParser<>)
=======
typeof (ClusterResponseParser<>),
typeof (InterestingTermsResponseParser<>),
typeof (MoreLikeThisHandlerMatchResponseParser<>),
>>>>>>>
typeof (ClusterResponseParser<>),
typeof (TermsResponseParser<>)
typeof (InterestingTermsResponseParser<>),
typeof (MoreLikeThisHandlerMatchResponseParser<>), |
<<<<<<<
builder.RegisterType<MappingValidator>().As<IMappingValidator>();
builder.RegisterType<SolrDictionarySerializer>().As<ISolrDocumentSerializer<Dictionary<string, object>>>();
builder.RegisterType<SolrDictionaryDocumentResponseParser>().As<ISolrDocumentResponseParser<Dictionary<string, object>>>();
=======
builder.RegisterType<MappingValidator>().As<IMappingValidator>();
builder.RegisterType<SolrStatusResponseParser>().As<ISolrStatusResponseParser>();
builder.RegisterType<SolrCoreAdmin>().As<ISolrCoreAdmin>();
>>>>>>>
builder.RegisterType<MappingValidator>().As<IMappingValidator>();
builder.RegisterType<SolrStatusResponseParser>().As<ISolrStatusResponseParser>();
builder.RegisterType<SolrCoreAdmin>().As<ISolrCoreAdmin>();
builder.RegisterType<SolrDictionarySerializer>().As<ISolrDocumentSerializer<Dictionary<string, object>>>();
builder.RegisterType<SolrDictionaryDocumentResponseParser>().As<ISolrDocumentResponseParser<Dictionary<string, object>>>(); |
<<<<<<<
if (!RTCore.Instance.ctrlLockAddon.IsLockSet())
RTCore.Instance.ctrlLockAddon.SetFullLock("RemoteTech");
=======
InputLockManager.SetControlLock(ControlTypes.CAMERACONTROLS, "RTLockControlCamForWindows");
>>>>>>>
InputLockManager.SetControlLock(ControlTypes.CAMERACONTROLS, "RTLockControlCamForWindows");
if (!RTCore.Instance.ctrlLockAddon.IsLockSet())
RTCore.Instance.ctrlLockAddon.SetFullLock("RemoteTech");
<<<<<<<
// only if the controllock is set
if (InputLockManager.GetControlLock("RTLockControlForWindows") != ControlTypes.None)
{
InputLockManager.RemoveControlLock("RTLockControlForWindows");
if (RTCore.Instance.ctrlLockAddon.IsLockSet("RemoteTech"))
RTCore.Instance.ctrlLockAddon.UnsetFullLock("RemoteTech");
}
=======
InputLockManager.RemoveControlLock("RTLockControlForWindows");
InputLockManager.RemoveControlLock("RTLockControlCamForWindows");
>>>>>>>
// only if the controllock is set
if (InputLockManager.GetControlLock("RTLockControlForWindows") != ControlTypes.None)
{
InputLockManager.RemoveControlLock("RTLockControlForWindows");
InputLockManager.RemoveControlLock("RTLockControlCamForWindows");
if (RTCore.Instance.ctrlLockAddon.IsLockSet("RemoteTech"))
RTCore.Instance.ctrlLockAddon.UnsetFullLock("RemoteTech");
} |
<<<<<<<
internal async Task UploadFromStreamAsyncHelper(Stream source, long? length, bool createNew, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
=======
internal Task UploadFromStreamAsyncHelper(Stream source, long? length, bool createNew, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
#endif
>>>>>>>
internal async Task UploadFromStreamAsyncHelper(Stream source, long? length, bool createNew, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
#endif
<<<<<<<
// We should always call AsStreamForWrite with bufferSize=0 to prevent buffering. Our
// stream copier only writes 64K buffers at a time anyway, so no buffering is needed.
await source.WriteToAsync(blobStream, length, null /* maxLength */, false, tempExecutionState, null /* streamCopyState */, cancellationToken).ConfigureAwait(false);
await blobStream.CommitAsync().ConfigureAwait(false);
}
=======
using (CloudBlobStream blobStream = await this.OpenWriteAsync(createNew, accessCondition, options, operationContext, cancellationToken))
{
// We should always call AsStreamForWrite with bufferSize=0 to prevent buffering. Our
// stream copier only writes 64K buffers at a time anyway, so no buffering is needed.
#if NETCORE
await source.WriteToAsync(progressIncrementer.CreateProgressIncrementingStream(blobStream), length, null /* maxLength */, false, tempExecutionState, null /* streamCopyState */, cancellationToken);
#else
await source.WriteToAsync(blobStream, length, null /* maxLength */, false, tempExecutionState, null /* streamCopyState */, cancellationToken);
#endif
await blobStream.CommitAsync();
}
}, cancellationToken);
>>>>>>>
// We should always call AsStreamForWrite with bufferSize=0 to prevent buffering. Our
// stream copier only writes 64K buffers at a time anyway, so no buffering is needed.
#if NETCORE
await source.WriteToAsync(progressIncrementer.CreateProgressIncrementingStream(blobStream), length, null /* maxLength */, false, tempExecutionState, null /* streamCopyState */, cancellationToken).ConfigureAwait(false);
#else
await source.WriteToAsync(blobStream, length, null /* maxLength */, false, tempExecutionState, null /* streamCopyState */, cancellationToken).ConfigureAwait(false);
#endif
await blobStream.CommitAsync().ConfigureAwait(false);
}
<<<<<<<
await this.UploadFromStreamAsync(stream, accessCondition, options, operationContext, cancellationToken).ConfigureAwait(false);
}
=======
using (Stream stream = new FileStream(path, FileMode.Open, FileAccess.Read))
{
await this.UploadFromStreamAsync(stream, accessCondition, options, operationContext, progressHandler, cancellationToken);
}
}, cancellationToken);
>>>>>>>
await this.UploadFromStreamAsync(stream, accessCondition, options, operationContext, progressHandler, cancellationToken).ConfigureAwait(false);
}
<<<<<<<
await this.AppendFromStreamAsync(stream, accessCondition, options, operationContext, cancellationToken).ConfigureAwait(false);
}
=======
using (Stream stream = new FileStream(path, FileMode.Open, FileAccess.Read))
{
await this.AppendFromStreamAsync(stream, accessCondition, options, operationContext, progressHandler, cancellationToken);
}
}, cancellationToken);
>>>>>>>
await this.AppendFromStreamAsync(stream, accessCondition, options, operationContext, progressHandler, cancellationToken).ConfigureAwait(false);
}
<<<<<<<
StreamDescriptor streamCopyState = new StreamDescriptor();
long startPosition = seekableStream.Position;
await blockDataAsStream.WriteToAsync(writeToStream, null /* copyLength */, Constants.MaxAppendBlockSize, requiresContentMD5, tempExecutionState, streamCopyState, cancellationToken).ConfigureAwait(false);
seekableStream.Position = startPosition;
if (requiresContentMD5)
=======
#if NETCORE
seekableStream = new AggregatingProgressIncrementer(progressHandler).CreateProgressIncrementingStream(seekableStream);
#endif
return await Executor.ExecuteAsync(
this.AppendBlockImpl(seekableStream, contentMD5, accessCondition, modifiedOptions),
modifiedOptions.RetryPolicy,
operationContext,
cancellationToken);
}
finally
{
if (seekableStreamCreated)
>>>>>>>
StreamDescriptor streamCopyState = new StreamDescriptor();
long startPosition = seekableStream.Position;
await blockDataAsStream.WriteToAsync(writeToStream, null /* copyLength */, Constants.MaxAppendBlockSize, requiresContentMD5, tempExecutionState, streamCopyState, cancellationToken).ConfigureAwait(false);
seekableStream.Position = startPosition;
if (requiresContentMD5)
<<<<<<<
public virtual async Task<string> DownloadTextAsync(Encoding encoding, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
=======
public virtual Task<string> DownloadTextAsync(Encoding encoding, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
#endif
>>>>>>>
public virtual async Task<string> DownloadTextAsync(Encoding encoding, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
public virtual async Task<string> DownloadTextAsync(Encoding encoding, AccessCondition accessCondition, BlobRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
#endif
<<<<<<<
await this.DownloadToStreamAsync(stream, accessCondition, options, operationContext, cancellationToken).ConfigureAwait(false);
byte[] streamAsBytes = stream.ToArray();
return (encoding ?? Encoding.UTF8).GetString(streamAsBytes, 0, streamAsBytes.Length);
}
=======
using (SyncMemoryStream stream = new SyncMemoryStream())
{
#if NETCORE
await this.DownloadToStreamAsync(new AggregatingProgressIncrementer(progressHandler).CreateProgressIncrementingStream(stream), accessCondition, options, operationContext, cancellationToken);
#else
await this.DownloadToStreamAsync(stream, accessCondition, options, operationContext, cancellationToken);
#endif
byte[] streamAsBytes = stream.ToArray();
return (encoding ?? Encoding.UTF8).GetString(streamAsBytes, 0, streamAsBytes.Length);
}
}, cancellationToken);
>>>>>>>
#if NETCORE
await this.DownloadToStreamAsync(new AggregatingProgressIncrementer(progressHandler).CreateProgressIncrementingStream(stream), accessCondition, options, operationContext, cancellationToken).ConfigureAwait(false);
#else
await this.DownloadToStreamAsync(stream, accessCondition, options, operationContext, cancellationToken).ConfigureAwait(false);
#endif
byte[] streamAsBytes = stream.ToArray();
return (encoding ?? Encoding.UTF8).GetString(streamAsBytes, 0, streamAsBytes.Length);
} |
<<<<<<<
/// <summary>
/// Load a preset config into the remotetech settings object.
/// </summary>
private static Settings LoadPreset(Settings settings, UrlDir.UrlConfig curSet)
{
settings.PreSets.Add(curSet.url);
RTLog.Notify("Override RTSettings with configs from {0}", curSet.url);
settings.backupFields();
ConfigNode.LoadObjectFromConfig(settings, curSet.config);
settings.restoreBackups();
return settings;
}
=======
/// <summary>
/// Adds a new ground station to the list and returns a new guid id for
/// a successfull new station otherwise a Guid.Empty will be returned.
/// </summary>
/// <param name="name">Name of the ground station</param>
/// <param name="latitude">latitude position</param>
/// <param name="longitude">longitude position</param>
/// <param name="height">height from asl</param>
/// <param name="body">Referencebody 1=Kerbin etc...</param>
public Guid AddGroundStation(string name, double latitude, double longitude, double height, int body)
{
RTLog.Notify("Trying to add groundstation({0})", RTLogLevel.LVL1, name);
MissionControlSatellite newGroundStation = new MissionControlSatellite();
newGroundStation.SetDetails(name, latitude, longitude, height, body);
// Already on the list?
var foundsat = this.GroundStations.Where(ms => ms.GetDetails().Equals(newGroundStation.GetDetails())).FirstOrDefault();
if (foundsat != null)
{
RTLog.Notify("Groundstation already exists!", RTLogLevel.LVL1);
return Guid.Empty;
}
this.GroundStations.Add(newGroundStation);
this.Save();
return newGroundStation.mGuid;
}
/// <summary>
/// Removes a ground station from the list by its unique <paramref name="stationid"/>.
/// Returns true for a successfull removed station, otherwise false
/// </summary>
/// <param name="stationid">Unique ground station id</param>
public bool RemoveGroundStation(Guid stationid)
{
RTLog.Notify("Trying to remove groundstation {0}", RTLogLevel.LVL1, stationid);
for (int i = this.GroundStations.Count - 1; i >= 0; i--)
{
if (this.GroundStations[i].mGuid.Equals(stationid))
{
RTLog.Notify("Removing {0} ", RTLogLevel.LVL1, GroundStations[i].GetName());
this.GroundStations.RemoveAt(i);
this.Save();
return true;
}
}
RTLog.Notify("Cannot find station {0}", RTLogLevel.LVL1, stationid);
return false;
}
>>>>>>>
/// <summary>
/// Load a preset config into the remotetech settings object.
/// </summary>
private static Settings LoadPreset(Settings settings, UrlDir.UrlConfig curSet)
{
settings.PreSets.Add(curSet.url);
RTLog.Notify("Override RTSettings with configs from {0}", curSet.url);
settings.backupFields();
ConfigNode.LoadObjectFromConfig(settings, curSet.config);
settings.restoreBackups();
return settings;
}
/// Adds a new ground station to the list and returns a new guid id for
/// a successfull new station otherwise a Guid.Empty will be returned.
/// </summary>
/// <param name="name">Name of the ground station</param>
/// <param name="latitude">latitude position</param>
/// <param name="longitude">longitude position</param>
/// <param name="height">height from asl</param>
/// <param name="body">Referencebody 1=Kerbin etc...</param>
public Guid AddGroundStation(string name, double latitude, double longitude, double height, int body)
{
RTLog.Notify("Trying to add groundstation({0})", RTLogLevel.LVL1, name);
MissionControlSatellite newGroundStation = new MissionControlSatellite();
newGroundStation.SetDetails(name, latitude, longitude, height, body);
// Already on the list?
var foundsat = this.GroundStations.Where(ms => ms.GetDetails().Equals(newGroundStation.GetDetails())).FirstOrDefault();
if (foundsat != null)
{
RTLog.Notify("Groundstation already exists!", RTLogLevel.LVL1);
return Guid.Empty;
}
this.GroundStations.Add(newGroundStation);
this.Save();
return newGroundStation.mGuid;
}
/// <summary>
/// Removes a ground station from the list by its unique <paramref name="stationid"/>.
/// Returns true for a successfull removed station, otherwise false
/// </summary>
/// <param name="stationid">Unique ground station id</param>
public bool RemoveGroundStation(Guid stationid)
{
RTLog.Notify("Trying to remove groundstation {0}", RTLogLevel.LVL1, stationid);
for (int i = this.GroundStations.Count - 1; i >= 0; i--)
{
if (this.GroundStations[i].mGuid.Equals(stationid))
{
RTLog.Notify("Removing {0} ", RTLogLevel.LVL1, GroundStations[i].GetName());
this.GroundStations.RemoveAt(i);
this.Save();
return true;
}
}
RTLog.Notify("Cannot find station {0}", RTLogLevel.LVL1, stationid);
return false;
} |
<<<<<<<
// Remove GUI stuff
GameEvents.onShowUI.Remove(UIOn);
GameEvents.onHideUI.Remove(UIOff);
=======
// addons
if (ctrlLockAddon != null) ctrlLockAddon = null;
if (kacAddon != null) kacAddon = null;
>>>>>>>
// Remove GUI stuff
GameEvents.onShowUI.Remove(UIOn);
GameEvents.onHideUI.Remove(UIOff);
// addons
if (ctrlLockAddon != null) ctrlLockAddon = null;
if (kacAddon != null) kacAddon = null; |
<<<<<<<
#else
ExecutionState<NullType> tempExecutionState = BlobCommonUtility.CreateTemporaryExecutionState(modifiedOptions);
#endif
return Task.Run(async () =>
{
Stream pageDataAsStream = pageData;
Stream seekableStream = pageDataAsStream;
bool seekableStreamCreated = false;
=======
Stream pageDataAsStream = pageData;
Stream seekableStream = pageDataAsStream;
bool seekableStreamCreated = false;
>>>>>>>
#else
ExecutionState<NullType> tempExecutionState = BlobCommonUtility.CreateTemporaryExecutionState(modifiedOptions);
#endif
Stream pageDataAsStream = pageData;
Stream seekableStream = pageDataAsStream;
bool seekableStreamCreated = false; |
<<<<<<<
public static StorageRequestMessage AppendBlock(Uri uri, Uri sourceUri, long? offset, long? count, string sourceContentMd5, int? timeout, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition,
HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials, BlobRequestOptions options)
=======
public static StorageRequestMessage AppendBlock(Uri uri, Uri sourceUri, long? offset, long? count, Checksum sourceContentChecksum, int? timeout, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials)
>>>>>>>
public static StorageRequestMessage AppendBlock(Uri uri, Uri sourceUri, long? offset, long? count, Checksum sourceContentChecksum, int? timeout, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials, BlobRequestOptions options)
<<<<<<<
/// <param name="contentMD5">The MD5 calculated for the range of bytes of the source.</param>
/// <param name="timeout">An integer specifying the server timeout interval.</param>
/// <param name="blockId">A string specifying the block ID for this block.</param>
/// <param name="accessCondition">An <see cref="AccessCondition"/> object that represents the condition that must be met in order for the request to proceed.</param>
/// <param name="content">The HTTP entity body and content headers.</param>
/// <param name="operationContext">An <see cref="OperationContext"/> object that represents the context for the current operation.</param>
/// <param name="canonicalizer">A canonicalizer that converts HTTP request data into a standard form appropriate for signing.</param>
/// <param name="credentials">A <see cref="StorageCredentials"/> object providing credentials for the request.</param>
/// <param name="options">A <see cref="BlobRequestOptions"/> object containing blob request options</param>
/// <returns>A web request to use to perform the operation.</returns>
public static StorageRequestMessage PutBlock(Uri uri, Uri sourceUri, long? offset, long? count, string contentMD5, int? timeout, string blockId, AccessCondition accessCondition, HttpContent content,
OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials, BlobRequestOptions options)
{
return BlobHttpRequestMessageFactory.PutBlock(uri, sourceUri, offset, count, contentMD5, timeout, blockId, accessCondition, content, true /* useVersionHeader */,
operationContext, canonicalizer, credentials, options);
}
/// <summary>
/// Constructs a web request to write a block to a block blob.
/// </summary>
/// <param name="uri">A <see cref="System.Uri"/> specifying the absolute URI to the blob.</param>
/// <param name="sourceUri">A <see cref="System.Uri"/> specifying the absolute URI to the source blob.</param>
/// <param name="offset">The byte offset at which to begin returning content.</param>
/// <param name="count">The number of bytes to return, or <c>null</c> to return all bytes through the end of the blob.</param>
/// <param name="sourceContentMd5">The MD5 calculated for the range of bytes of the source.</param>
=======
/// <param name="sourceContentChecksum">The checksum calculated for the range of bytes of the source.</param>
>>>>>>>
/// <param name="sourceContentChecksum">The checksum calculated for the range of bytes of the source.</param>
<<<<<<<
public static StorageRequestMessage PutPage(Uri uri, Uri sourceUri, long? offset, long? count, string sourceContentMd5, int? timeout, PageRange pageRange,
AccessCondition sourceAccessCondition, AccessCondition destAccessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials, BlobRequestOptions options)
=======
public static StorageRequestMessage PutPage(Uri uri, Uri sourceUri, long? offset, long? count, Checksum sourceContentChecksum, int? timeout, PageRange pageRange, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials)
>>>>>>>
public static StorageRequestMessage PutPage(Uri uri, Uri sourceUri, long? offset, long? count, Checksum sourceContentChecksum, int? timeout, PageRange pageRange, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials, BlobRequestOptions options)
<<<<<<<
return CopyFrom(uri, timeout, source, default(string) /* contentMD5 */, incrementalCopy, false /* syncCopy */, premiumPageBlobTier, standardBlockBlobTier, rehydratePriority, sourceAccessCondition, destAccessCondition, content, operationContext, canonicalizer, credentials);
=======
return CopyFrom(uri, timeout, source, new Checksum(md5: default(string), crc64: default(string)), incrementalCopy, false /* syncCopy */, premiumPageBlobTier, sourceAccessCondition, destAccessCondition, content, operationContext, canonicalizer, credentials);
>>>>>>>
return CopyFrom(uri, timeout, source, new Checksum(md5: default(string), crc64: default(string)), incrementalCopy, false /* syncCopy */, premiumPageBlobTier, standardBlockBlobTier, rehydratePriority, sourceAccessCondition, destAccessCondition, content, operationContext, canonicalizer, credentials);
<<<<<<<
internal static StorageRequestMessage CopyFrom(Uri uri, int? timeout, Uri source, string sourceContentMd5, bool incrementalCopy, bool syncCopy, PremiumPageBlobTier? premiumPageBlobTier, StandardBlobTier? standardBlockBlobTier, RehydratePriority? rehydratePriority, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials)
=======
public static StorageRequestMessage CopyFrom(Uri uri, int? timeout, Uri source, Checksum sourceContentChecksum, bool incrementalCopy, bool syncCopy, PremiumPageBlobTier? premiumPageBlobTier, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials)
>>>>>>>
public static StorageRequestMessage CopyFrom(Uri uri, int? timeout, Uri source, Checksum sourceContentChecksum, bool incrementalCopy, bool syncCopy, PremiumPageBlobTier? premiumPageBlobTier, StandardBlobTier? standardBlockBlobTier, RehydratePriority? rehydratePriority, AccessCondition sourceAccessCondition, AccessCondition destAccessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials)
<<<<<<<
public static StorageRequestMessage Get(Uri uri, int? timeout, DateTimeOffset? snapshot, long? offset, long? count, bool rangeContentMD5, AccessCondition accessCondition,
HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials, BlobRequestOptions options)
=======
public static StorageRequestMessage Get(Uri uri, int? timeout, DateTimeOffset? snapshot, long? offset, long? count, ChecksumRequested rangeContentChecksumRequested, AccessCondition accessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials)
>>>>>>>
public static StorageRequestMessage Get(Uri uri, int? timeout, DateTimeOffset? snapshot, long? offset, long? count, ChecksumRequested rangeContentChecksumRequested, AccessCondition accessCondition, HttpContent content, OperationContext operationContext, ICanonicalizer canonicalizer, StorageCredentials credentials, BlobRequestOptions options) |
<<<<<<<
using System;
using System.Collections.Generic;
=======
using System;
>>>>>>>
using System;
using System.Collections.Generic;
<<<<<<<
=======
[Attr("offset-date")]
public DateTimeOffset? OffsetDate { get; set; }
>>>>>>>
[Attr("offset-date")]
public DateTimeOffset? OffsetDate { get; set; } |
<<<<<<<
[Attr("calculated-value", isImmutable: true)]
public string CalculatedValue
{
get => "joe";
}
=======
[Attr("offset-date")]
public DateTimeOffset? OffsetDate { get; set; }
>>>>>>>
[Attr("calculated-value", isImmutable: true)]
public string CalculatedValue
{
get => "joe";
}
[Attr("offset-date")]
public DateTimeOffset? OffsetDate { get; set; } |
<<<<<<<
public event EventHandler<GitHubNewContributorsEventArgs> Updated = null;
=======
>>>>>>> |
<<<<<<<
using Microsoft.Extensions.Options;
=======
using System;
>>>>>>>
using Microsoft.Extensions.Options;
<<<<<<<
private static ILogger Logger;
=======
>>>>>>>
<<<<<<<
ConfigureAspNetFeatures(services);
services.AddSingleton<IConfigureOptions<SignalrTagHelperOptions>, ConfigureSignalrTagHelperOptions>();
services.AddSingleton<SignalrTagHelperOptions>(cfg => cfg.GetService<IOptions<SignalrTagHelperOptions>>().Value);
=======
services.ConfigureAspNetFeatures();
>>>>>>>
services.ConfigureAspNetFeatures();
services.AddSingleton<IConfigureOptions<SignalrTagHelperOptions>, ConfigureSignalrTagHelperOptions>();
services.AddSingleton<SignalrTagHelperOptions>(cfg => cfg.GetService<IOptions<SignalrTagHelperOptions>>().Value);
<<<<<<<
Logger.LogInformation("Configuring Twitch Service");
var svc = new Services.TwitchService(Configuration, sp.GetService<ILoggerFactory>());
services.AddSingleton<IHostedService>(svc);
services.AddSingleton<IStreamService>(svc);
} else {
Logger.LogInformation("Skipping Twitch Configuration - missing StreamServices:Twitch:ClientId");
}
}
private static void ConfigureMixer(IServiceCollection services, IConfiguration Configuration, ServiceProvider sp)
{
if (!string.IsNullOrEmpty(Configuration["StreamServices:Mixer:ClientId"]))
=======
// Don't configure this service if it is disabled
if (isDisabled(configuration))
>>>>>>>
// Don't configure this service if it is disabled
if (isDisabled(configuration))
<<<<<<<
Logger.LogInformation("Configuring Mixer Service");
var mxr = new MixerService(Configuration, sp.GetService<ILoggerFactory>());
services.AddSingleton<IHostedService>(mxr);
services.AddSingleton<IStreamService>(mxr);
}
else
{
Logger.LogInformation("Skipping Mixer Configuration - missing StreamServices:Mixer:ClientId");
}
}
private static void ConfigureFake(IServiceCollection services, IConfiguration Configuration, ServiceProvider sp)
{
if (!bool.TryParse(Configuration["StreamServices:Fake:Enabled"], out var enabled) || !enabled) {
// unable to parse the value, by default disable the FakeService
// Exit now, we are not enabling the service
Logger.LogInformation("Skipping FakeService Configuration - StreamServices:Fake:Enabled not set or set to false");
=======
>>>>>>>
<<<<<<<
Logger.LogInformation("Configuring Fake Service");
var mck = new FakeService(Configuration, sp.GetService<ILoggerFactory>());
services.AddSingleton<IHostedService>(mck);
services.AddSingleton<IStreamService>(mck);
=======
// Configure and grab a logger so that we can log information
// about the creation of the services
var provider = services.BuildServiceProvider(); // Build a 'temporary' instance of the DI container
var loggerFactory = provider.GetService<ILoggerFactory>();
>>>>>>>
// Configure and grab a logger so that we can log information
// about the creation of the services
var provider = services.BuildServiceProvider(); // Build a 'temporary' instance of the DI container
var loggerFactory = provider.GetService<ILoggerFactory>(); |
<<<<<<<
await _edgeHubClient.SetMethodHandlerAsync("GetDiagnosticInfo", HandleGetDiagnosticInfoMethodAsync, _edgeHubClient);
await _edgeHubClient.SetMethodHandlerAsync("GetDiagnosticLog", HandleGetDiagnosticLogMethodAsync, _edgeHubClient);
await _edgeHubClient.SetMethodHandlerAsync("ExitApplication", HandleExitApplicationMethodAsync, _edgeHubClient);
await _edgeHubClient.SetMethodHandlerAsync("GetInfo", HandleGetInfoMethodAsync, _edgeHubClient);
=======
await _edgeHubClient.SetMethodDefaultHandlerAsync(DefaultMethodHandlerAsync, _edgeHubClient);
>>>>>>>
await _edgeHubClient.SetMethodHandlerAsync("GetDiagnosticInfo", HandleGetDiagnosticInfoMethodAsync, _edgeHubClient);
await _edgeHubClient.SetMethodHandlerAsync("GetDiagnosticLog", HandleGetDiagnosticLogMethodAsync, _edgeHubClient);
await _edgeHubClient.SetMethodHandlerAsync("ExitApplication", HandleExitApplicationMethodAsync, _edgeHubClient);
await _edgeHubClient.SetMethodHandlerAsync("GetInfo", HandleGetInfoMethodAsync, _edgeHubClient);
await _edgeHubClient.SetMethodDefaultHandlerAsync(DefaultMethodHandlerAsync, _edgeHubClient);
<<<<<<<
await _iotHubClient.SetMethodHandlerAsync("GetDiagnosticInfo", HandleGetDiagnosticInfoMethodAsync, _iotHubClient);
await _iotHubClient.SetMethodHandlerAsync("GetDiagnosticLog", HandleGetDiagnosticLogMethodAsync, _iotHubClient);
await _iotHubClient.SetMethodHandlerAsync("ExitApplication", HandleExitApplicationMethodAsync, _iotHubClient);
await _iotHubClient.SetMethodHandlerAsync("GetInfo", HandleGetInfoMethodAsync, _iotHubClient);
=======
await _edgeHubClient.SetMethodDefaultHandlerAsync(DefaultMethodHandlerAsync, _iotHubClient);
>>>>>>>
await _iotHubClient.SetMethodHandlerAsync("GetDiagnosticInfo", HandleGetDiagnosticInfoMethodAsync, _iotHubClient);
await _iotHubClient.SetMethodHandlerAsync("GetDiagnosticLog", HandleGetDiagnosticLogMethodAsync, _iotHubClient);
await _iotHubClient.SetMethodHandlerAsync("ExitApplication", HandleExitApplicationMethodAsync, _iotHubClient);
await _iotHubClient.SetMethodHandlerAsync("GetInfo", HandleGetInfoMethodAsync, _iotHubClient);
await _iotHubClient.SetMethodDefaultHandlerAsync(DefaultMethodHandlerAsync, _iotHubClient);
<<<<<<<
/// Handle method call to get diagnostic information.
/// </summary>
static async Task<MethodResponse> HandleGetDiagnosticInfoMethodAsync(MethodRequest methodRequest, object userContext)
{
string logPrefix = "HandleGetDiagnosticInfoMethodAsync:";
// get the diagnostic info
DiagnosticInfoMethodResponseModel diagnosticInfo = new DiagnosticInfoMethodResponseModel();
try
{
diagnosticInfo = GetDiagnosticInfo();
}
catch (Exception e)
{
Logger.Error(e, $"{logPrefix} Exception");
return (new MethodResponse((int)HttpStatusCode.InternalServerError));
}
// build response
string resultString = JsonConvert.SerializeObject(diagnosticInfo);
byte[] result = Encoding.UTF8.GetBytes(resultString);
MethodResponse methodResponse = new MethodResponse(result, (int)HttpStatusCode.OK);
Logger.Information($"{logPrefix} Success returning diagnostic info!");
return methodResponse;
}
/// <summary>
/// Handle method call to get log information.
/// </summary>
static async Task<MethodResponse> HandleGetDiagnosticLogMethodAsync(MethodRequest methodRequest, object userContext)
{
string logPrefix = "HandleGetDiagnosticLogMethodAsync:";
// get the diagnostic info
DiagnosticLogMethodResponseModel diagnosticLogMethodResponseModel = new DiagnosticLogMethodResponseModel();
try
{
diagnosticLogMethodResponseModel = await GetDiagnosticLogAsync();
}
catch (Exception e)
{
Logger.Error(e, $"{logPrefix} Exception");
return (new MethodResponse((int)HttpStatusCode.InternalServerError));
}
// build response
string resultString = JsonConvert.SerializeObject(diagnosticLogMethodResponseModel);
byte[] result = Encoding.UTF8.GetBytes(resultString);
MethodResponse methodResponse = new MethodResponse(result, (int)HttpStatusCode.OK);
Logger.Information($"{logPrefix} Success returning diagnostic log!");
return methodResponse;
}
/// <summary>
/// Handle method call to get log information.
/// </summary>
static async Task<MethodResponse> HandleExitApplicationMethodAsync(MethodRequest methodRequest, object userContext)
{
string logPrefix = "HandleExitApplicationMethodAsync:";
ExitApplicationMethodRequestModel exitApplicationMethodRequest = null;
try
{
Logger.Debug($"{logPrefix} called");
exitApplicationMethodRequest = JsonConvert.DeserializeObject<ExitApplicationMethodRequestModel>(methodRequest.DataAsJson);
}
catch (Exception e)
{
Logger.Error(e, $"{logPrefix} Exception");
return (new MethodResponse((int)HttpStatusCode.InternalServerError));
}
// get the parameter
ExitApplicationMethodRequestModel exitApplication = new ExitApplicationMethodRequestModel();
try
{
Task.Run(async () => await ExitApplicationAsync(exitApplicationMethodRequest.SecondsTillExit));
}
catch (Exception e)
{
Logger.Error(e, $"{logPrefix} Exception");
return (new MethodResponse((int)HttpStatusCode.InternalServerError));
}
Logger.Information($"{logPrefix} Success returning exit application!");
return (new MethodResponse((int)HttpStatusCode.OK));
}
/// <summary>
/// Handle method call to get application information.
/// </summary>
static async Task<MethodResponse> HandleGetInfoMethodAsync(MethodRequest methodRequest, object userContext)
{
string logPrefix = "HandleGetInfoMethodAsync:";
// get the info
GetInfoMethodResponseModel getInfoMethodResponseModel = new GetInfoMethodResponseModel();
getInfoMethodResponseModel.VersionMajor = Assembly.GetExecutingAssembly().GetName().Version.Major;
getInfoMethodResponseModel.VersionMinor = Assembly.GetExecutingAssembly().GetName().Version.Minor;
getInfoMethodResponseModel.VersionPatch = Assembly.GetExecutingAssembly().GetName().Version.Build;
getInfoMethodResponseModel.SemanticVersion = (Attribute.GetCustomAttribute(Assembly.GetEntryAssembly(), typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute).InformationalVersion;
getInfoMethodResponseModel.InformationalVersion = (Attribute.GetCustomAttribute(Assembly.GetEntryAssembly(), typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute).InformationalVersion;
getInfoMethodResponseModel.OS = RuntimeInformation.OSDescription;
getInfoMethodResponseModel.OSArchitecture = RuntimeInformation.OSArchitecture;
getInfoMethodResponseModel.FrameworkDescription = RuntimeInformation.FrameworkDescription;
// build response
string resultString = JsonConvert.SerializeObject(getInfoMethodResponseModel);
byte[] result = Encoding.UTF8.GetBytes(resultString);
MethodResponse methodResponse = new MethodResponse(result, (int)HttpStatusCode.OK);
Logger.Information($"{logPrefix} Success returning application info!");
return methodResponse;
}
/// <summary>
=======
/// Method that is called for any unimplemented call. Just returns that info to the caller
/// </summary>
/// <param name="methodRequest"></param>
/// <param name="userContext"></param>
/// <returns></returns>
private async Task<MethodResponse> DefaultMethodHandlerAsync(MethodRequest methodRequest, object userContext)
{
Logger.Information($"Received direct method call for {methodRequest.Name} which is not implemented");
string response = $"Method {methodRequest.Name} successfully received but this method is not implemented";
string resultString = JsonConvert.SerializeObject(response);
byte[] result = Encoding.UTF8.GetBytes(resultString);
MethodResponse methodResponse = new MethodResponse(result, (int)HttpStatusCode.OK);
return methodResponse;
}
/// <summary>
>>>>>>>
/// Handle method call to get diagnostic information.
/// </summary>
static async Task<MethodResponse> HandleGetDiagnosticInfoMethodAsync(MethodRequest methodRequest, object userContext)
{
string logPrefix = "HandleGetDiagnosticInfoMethodAsync:";
// get the diagnostic info
DiagnosticInfoMethodResponseModel diagnosticInfo = new DiagnosticInfoMethodResponseModel();
try
{
diagnosticInfo = GetDiagnosticInfo();
}
catch (Exception e)
{
Logger.Error(e, $"{logPrefix} Exception");
return (new MethodResponse((int)HttpStatusCode.InternalServerError));
}
// build response
string resultString = JsonConvert.SerializeObject(diagnosticInfo);
byte[] result = Encoding.UTF8.GetBytes(resultString);
MethodResponse methodResponse = new MethodResponse(result, (int)HttpStatusCode.OK);
Logger.Information($"{logPrefix} Success returning diagnostic info!");
return methodResponse;
}
/// <summary>
/// Handle method call to get log information.
/// </summary>
static async Task<MethodResponse> HandleGetDiagnosticLogMethodAsync(MethodRequest methodRequest, object userContext)
{
string logPrefix = "HandleGetDiagnosticLogMethodAsync:";
// get the diagnostic info
DiagnosticLogMethodResponseModel diagnosticLogMethodResponseModel = new DiagnosticLogMethodResponseModel();
try
{
diagnosticLogMethodResponseModel = await GetDiagnosticLogAsync();
}
catch (Exception e)
{
Logger.Error(e, $"{logPrefix} Exception");
return (new MethodResponse((int)HttpStatusCode.InternalServerError));
}
// build response
string resultString = JsonConvert.SerializeObject(diagnosticLogMethodResponseModel);
byte[] result = Encoding.UTF8.GetBytes(resultString);
MethodResponse methodResponse = new MethodResponse(result, (int)HttpStatusCode.OK);
Logger.Information($"{logPrefix} Success returning diagnostic log!");
return methodResponse;
}
/// <summary>
/// Handle method call to get log information.
/// </summary>
static async Task<MethodResponse> HandleExitApplicationMethodAsync(MethodRequest methodRequest, object userContext)
{
string logPrefix = "HandleExitApplicationMethodAsync:";
ExitApplicationMethodRequestModel exitApplicationMethodRequest = null;
try
{
Logger.Debug($"{logPrefix} called");
exitApplicationMethodRequest = JsonConvert.DeserializeObject<ExitApplicationMethodRequestModel>(methodRequest.DataAsJson);
}
catch (Exception e)
{
Logger.Error(e, $"{logPrefix} Exception");
return (new MethodResponse((int)HttpStatusCode.InternalServerError));
}
// get the parameter
ExitApplicationMethodRequestModel exitApplication = new ExitApplicationMethodRequestModel();
try
{
Task.Run(async () => await ExitApplicationAsync(exitApplicationMethodRequest.SecondsTillExit));
}
catch (Exception e)
{
Logger.Error(e, $"{logPrefix} Exception");
return (new MethodResponse((int)HttpStatusCode.InternalServerError));
}
Logger.Information($"{logPrefix} Success returning exit application!");
return (new MethodResponse((int)HttpStatusCode.OK));
}
/// <summary>
/// Handle method call to get application information.
/// </summary>
static async Task<MethodResponse> HandleGetInfoMethodAsync(MethodRequest methodRequest, object userContext)
{
string logPrefix = "HandleGetInfoMethodAsync:";
// get the info
GetInfoMethodResponseModel getInfoMethodResponseModel = new GetInfoMethodResponseModel();
getInfoMethodResponseModel.VersionMajor = Assembly.GetExecutingAssembly().GetName().Version.Major;
getInfoMethodResponseModel.VersionMinor = Assembly.GetExecutingAssembly().GetName().Version.Minor;
getInfoMethodResponseModel.VersionPatch = Assembly.GetExecutingAssembly().GetName().Version.Build;
getInfoMethodResponseModel.SemanticVersion = (Attribute.GetCustomAttribute(Assembly.GetEntryAssembly(), typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute).InformationalVersion;
getInfoMethodResponseModel.InformationalVersion = (Attribute.GetCustomAttribute(Assembly.GetEntryAssembly(), typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute).InformationalVersion;
getInfoMethodResponseModel.OS = RuntimeInformation.OSDescription;
getInfoMethodResponseModel.OSArchitecture = RuntimeInformation.OSArchitecture;
getInfoMethodResponseModel.FrameworkDescription = RuntimeInformation.FrameworkDescription;
// build response
string resultString = JsonConvert.SerializeObject(getInfoMethodResponseModel);
byte[] result = Encoding.UTF8.GetBytes(resultString);
MethodResponse methodResponse = new MethodResponse(result, (int)HttpStatusCode.OK);
Logger.Information($"{logPrefix} Success returning application info!");
return methodResponse;
}
/// </summary>
/// Method that is called for any unimplemented call. Just returns that info to the caller
/// </summary>
private async Task<MethodResponse> DefaultMethodHandlerAsync(MethodRequest methodRequest, object userContext)
{
Logger.Information($"Received direct method call for {methodRequest.Name}, which is not implemented");
string response = $"Method {methodRequest.Name} successfully received, but this method is not implemented";
string resultString = JsonConvert.SerializeObject(response);
byte[] result = Encoding.UTF8.GetBytes(resultString);
MethodResponse methodResponse = new MethodResponse(result, (int)HttpStatusCode.OK);
return methodResponse;
}
/// <summary> |
<<<<<<<
// composite hologram onto video
BlitCompositeTexture(renderTexture, colorRGBTexture, compositeTexture);
=======
if (IsVideoRecordingQuadrantMode)
{
// Composite hologram onto video for recording quadrant mode video, or for previewing
// that quadrant-mode video on screen.
BlitCompositeTexture(renderTexture, colorRGBTexture, compositeTexture);
}
else
{
// Render the real-world video back onto the composited frame to reduce the opacity
// of the hologram by the appropriate amount.
holoAlphaMat.SetTexture("_FrontTex", renderTexture);
Graphics.Blit(sourceTexture, compositeTexture, holoAlphaMat);
}
>>>>>>>
if (IsVideoRecordingQuadrantMode)
{
// Composite hologram onto video for recording quadrant mode video, or for previewing
// that quadrant-mode video on screen.
BlitCompositeTexture(renderTexture, colorRGBTexture, compositeTexture);
}
else
{
// Render the real-world video back onto the composited frame to reduce the opacity
// of the hologram by the appropriate amount.
holoAlphaMat.SetTexture("_FrontTex", renderTexture);
Graphics.Blit(sourceTexture, compositeTexture, holoAlphaMat);
}
<<<<<<<
BlitQuadView(renderTexture, alphaTexture, colorRGBTexture, outputTexture, quadViewOutputTexture);
=======
if (ShouldProduceQuadrantVideoFrame)
{
CreateQuadrantTexture();
BlitQuadView(renderTexture, alphaTexture, colorRGBTexture, compositeTexture, quadViewOutputTexture);
}
>>>>>>>
if (ShouldProduceQuadrantVideoFrame)
{
CreateQuadrantTexture();
BlitQuadView(renderTexture, alphaTexture, colorRGBTexture, outputTexture, quadViewOutputTexture);
} |
<<<<<<<
var prefix = IsSecureConnection() ? Constants.CdnSecurePrefix : Constants.CdnPrefix;
return FormatStyleVirtualPath(entry.ResourceName, minified).Replace("~/", prefix);
=======
var prefix = (IsSecureConnection() ? "https:" : "http:") + Constants.CdnPrefix;
return FormatStyleVirtualPath(name, minified).Replace("~/", prefix);
>>>>>>>
var prefix = (IsSecureConnection() ? "https:" : "http:") + Constants.CdnPrefix;
return FormatStyleVirtualPath(entry.ResourceName, minified).Replace("~/", prefix); |
<<<<<<<
this.BlockBlobTier = other.BlockBlobTier;
this.PageBlobTier = other.PageBlobTier;
this.RehydrationStatus = other.RehydrationStatus;
=======
this.PremiumPageBlobTier = other.PremiumPageBlobTier;
>>>>>>>
this.PremiumPageBlobTier = other.PremiumPageBlobTier;
this.BlockBlobTier = other.BlockBlobTier;
this.RehydrationStatus = other.RehydrationStatus;
<<<<<<<
/// <summary>
/// Gets a value indicating the tier of the block blob.
/// </summary>
/// <value>A <see cref="BlockBlobTier"/> object that indicates the block blob tier.</value>
public BlockBlobTier? BlockBlobTier { get; internal set; }
/// <summary>
/// Gets a value indicating the tier of the page blob.
/// </summary>
/// <value>A <see cref="PageBlobTier"/> object that indicates the page blob tier.</value>
public PageBlobTier? PageBlobTier { get; internal set; }
/// <summary>
/// Gets a value indicating that the blob is being rehdrated and the tier of the blob once
/// the rehydration from archive has completed.
/// </summary>
/// <value>A <see cref="RehydrationStatus"/> representing the rehydration status of the blob.</value>
/// <remarks>Only applicable for block blobs in this version of the library.</remarks>
public RehydrationStatus? RehydrationStatus { get; internal set; }
=======
/// <summary>
/// Gets a value indicating the tier of the premium page blob.
/// </summary>
/// <value>A <see cref="PremiumPageBlobTier"/> object that indicates the page blob tier.</value>
public PremiumPageBlobTier? PremiumPageBlobTier { get; internal set; }
/// <summary>
/// Gets a value indicating if the tier of the premium page blob has been inferred.
/// </summary>
/// <value>A bool representing if the premium blob tier has been inferred.</value>
public bool? BlobTierInferred { get; internal set; }
>>>>>>>
/// <summary>
/// Gets a value indicating the tier of the block blob.
/// </summary>
/// <value>A <see cref="BlockBlobTier"/> object that indicates the block blob tier.</value>
public BlockBlobTier? BlockBlobTier { get; internal set; }
/// <summary>
/// Gets a value indicating that the blob is being rehdrated and the tier of the blob once
/// the rehydration from archive has completed.
/// </summary>
/// <value>A <see cref="RehydrationStatus"/> representing the rehydration status of the blob.</value>
/// <remarks>Only applicable for block blobs in this version of the library.</remarks>
public RehydrationStatus? RehydrationStatus { get; internal set; }
/// Gets a value indicating the tier of the premium page blob.
/// </summary>
/// <value>A <see cref="PremiumPageBlobTier"/> object that indicates the page blob tier.</value>
public PremiumPageBlobTier? PremiumPageBlobTier { get; internal set; }
/// <summary>
/// Gets a value indicating if the tier of the premium page blob has been inferred.
/// </summary>
/// <value>A bool representing if the premium blob tier has been inferred.</value>
public bool? BlobTierInferred { get; internal set; } |
<<<<<<<
public sealed class Loader : LoadingSystem
{
public static void init()
{
// log version
Lib.Log("version " + Lib.Version());
// parse settings
Settings.parse();
// parse profile
Profile.parse();
// detect features
Features.detect();
// get configs from DB
UrlDir.UrlFile root = null;
foreach (UrlDir.UrlConfig url in GameDatabase.Instance.root.AllConfigs) { root = url.parent; break; }
// inject MM patches on-the-fly, so that profile/features can be queried with NEEDS[]
inject(root, "Profile", Lib.UppercaseFirst(Settings.Profile));
if (Features.Reliability) inject(root, "Feature", "Reliability");
if (Features.SpaceWeather) inject(root, "Feature", "SpaceWeather");
if (Features.Automation) inject(root, "Feature", "Automation");
if (Features.Science) inject(root, "Feature", "Science");
if (Features.Radiation) inject(root, "Feature", "Radiation");
if (Features.Shielding) inject(root, "Feature", "Shielding");
if (Features.LivingSpace) inject(root, "Feature", "LivingSpace");
if (Features.Comfort) inject(root, "Feature", "Comfort");
if (Features.Poisoning) inject(root, "Feature", "Poisoning");
if (Features.Pressure) inject(root, "Feature", "Pressure");
if (Features.Habitat) inject(root, "Feature", "Habitat");
if (Features.Supplies) inject(root, "Feature", "Supplies");
}
// inject an MM patch on-the-fly, so that NEEDS[TypeId] can be used in MM patches
static void inject(UrlDir.UrlFile root, string type, string id)
{
root.configs.Add(new UrlDir.UrlConfig(root, new ConfigNode(Lib.BuildString("@Kerbalism:FOR[", type, id, "]"))));
}
public override bool IsReady() { return true; }
public override string ProgressTitle() { return "Kerbalism"; }
public override float ProgressFraction() { return 0f; }
public override void StartLoad() { init(); }
}
// the name is choosen so that the awake method is called after ModuleManager one
// this is necessary because MM inject its loader at index 1, so we need to inject
// our own after it, at index 1 (so that it run just before MM)
[KSPAddon(KSPAddon.Startup.Instantly, false)]
public sealed class PatchInjector : MonoBehaviour
{
public void Awake()
{
// inject loader
List<LoadingSystem> loaders = LoadingScreen.Instance.loaders;
GameObject go = new GameObject("Kerbalism");
Loader loader = go.AddComponent<Loader>();
int index = loaders.FindIndex(k => k is GameDatabase);
loaders.Insert(index + 1, loader);
}
}
=======
public sealed class Loader : LoadingSystem
{
public static void init()
{
// log version
Lib.Log("version " + Lib.Version());
// parse settings
Settings.parse();
// parse profile
Profile.parse();
// detect features
Features.detect();
// get configs from DB
UrlDir.UrlFile root = null;
foreach (UrlDir.UrlConfig url in GameDatabase.Instance.root.AllConfigs) { root = url.parent; break; }
// inject MM patches on-the-fly, so that profile/features can be queried with NEEDS[]
inject(root, "Profile", Lib.UppercaseFirst(Settings.Profile));
if (Features.Reliability) inject(root, "Feature", "Reliability");
if (Features.Signal) inject(root, "Feature", "Signal");
if (Features.Deploy) inject(root, "Feature", "Deploy");
if (Features.SpaceWeather) inject(root, "Feature", "SpaceWeather");
if (Features.Automation) inject(root, "Feature", "Automation");
if (Features.Science) inject(root, "Feature", "Science");
if (Features.Radiation) inject(root, "Feature", "Radiation");
if (Features.Shielding) inject(root, "Feature", "Shielding");
if (Features.LivingSpace) inject(root, "Feature", "LivingSpace");
if (Features.Comfort) inject(root, "Feature", "Comfort");
if (Features.Poisoning) inject(root, "Feature", "Poisoning");
if (Features.Pressure) inject(root, "Feature", "Pressure");
if (Features.Habitat) inject(root, "Feature", "Habitat");
if (Features.Supplies) inject(root, "Feature", "Supplies");
}
// inject an MM patch on-the-fly, so that NEEDS[TypeId] can be used in MM patches
static void inject(UrlDir.UrlFile root, string type, string id)
{
root.configs.Add(new UrlDir.UrlConfig(root, new ConfigNode(Lib.BuildString("@Kerbalism:FOR[", type, id, "]"))));
}
public override bool IsReady() { return true; }
public override string ProgressTitle() { return "Kerbalism"; }
public override float ProgressFraction() { return 0f; }
public override void StartLoad() { init(); }
}
// the name is choosen so that the awake method is called after ModuleManager one
// this is necessary because MM inject its loader at index 1, so we need to inject
// our own after it, at index 1 (so that it run just before MM)
[KSPAddon(KSPAddon.Startup.Instantly, false)]
public sealed class PatchInjector : MonoBehaviour
{
public void Awake()
{
// inject loader
List<LoadingSystem> loaders = LoadingScreen.Instance.loaders;
GameObject go = new GameObject("Kerbalism");
Loader loader = go.AddComponent<Loader>();
int index = loaders.FindIndex(k => k is GameDatabase);
loaders.Insert(index + 1, loader);
}
}
>>>>>>>
public sealed class Loader : LoadingSystem
{
public static void init()
{
// log version
Lib.Log("version " + Lib.Version());
// parse settings
Settings.parse();
// parse profile
Profile.parse();
// detect features
Features.detect();
// get configs from DB
UrlDir.UrlFile root = null;
foreach (UrlDir.UrlConfig url in GameDatabase.Instance.root.AllConfigs) { root = url.parent; break; }
// inject MM patches on-the-fly, so that profile/features can be queried with NEEDS[]
inject(root, "Profile", Lib.UppercaseFirst(Settings.Profile));
if (Features.Reliability) inject(root, "Feature", "Reliability");
if (Features.SpaceWeather) inject(root, "Feature", "SpaceWeather");
if (Features.Automation) inject(root, "Feature", "Automation");
if (Features.Science) inject(root, "Feature", "Science");
if (Features.Radiation) inject(root, "Feature", "Radiation");
if (Features.Deploy) inject(root, "Feature", "Deploy");
if (Features.Shielding) inject(root, "Feature", "Shielding");
if (Features.LivingSpace) inject(root, "Feature", "LivingSpace");
if (Features.Comfort) inject(root, "Feature", "Comfort");
if (Features.Poisoning) inject(root, "Feature", "Poisoning");
if (Features.Pressure) inject(root, "Feature", "Pressure");
if (Features.Habitat) inject(root, "Feature", "Habitat");
if (Features.Supplies) inject(root, "Feature", "Supplies");
}
// inject an MM patch on-the-fly, so that NEEDS[TypeId] can be used in MM patches
static void inject(UrlDir.UrlFile root, string type, string id)
{
root.configs.Add(new UrlDir.UrlConfig(root, new ConfigNode(Lib.BuildString("@Kerbalism:FOR[", type, id, "]"))));
}
public override bool IsReady() { return true; }
public override string ProgressTitle() { return "Kerbalism"; }
public override float ProgressFraction() { return 0f; }
public override void StartLoad() { init(); }
}
// the name is choosen so that the awake method is called after ModuleManager one
// this is necessary because MM inject its loader at index 1, so we need to inject
// our own after it, at index 1 (so that it run just before MM)
[KSPAddon(KSPAddon.Startup.Instantly, false)]
public sealed class PatchInjector : MonoBehaviour
{
public void Awake()
{
// inject loader
List<LoadingSystem> loaders = LoadingScreen.Instance.loaders;
GameObject go = new GameObject("Kerbalism");
Loader loader = go.AddComponent<Loader>();
int index = loaders.FindIndex(k => k is GameDatabase);
loaders.Insert(index + 1, loader);
}
} |
<<<<<<<
=======
Signal = Lib.ConfigValue(cfg, "Signal", false);
if (Signal == true)
{
Lib.Log("Signal is enabled. This will likely be removed or re-worked in future version, so be warned.");
}
Deploy = Lib.ConfigValue(cfg, "Deploy", false);
>>>>>>>
Deploy = Lib.ConfigValue(cfg, "Deploy", false);
<<<<<<<
public static bool Reliability; // component malfunctions and critical failures
public static bool Science; // science data storage, transmission and analysis
public static bool SpaceWeather; // coronal mass ejections
public static bool Automation; // control vessel components using scripts
=======
public static bool Reliability; // component malfunctions and critical failures
public static bool Signal; // communications using low-gain and high-gain antennas
public static bool Deploy; // add ecCost to keep Antenna working, add ecCost to Extend\Retract parts
public static bool Science; // science data storage, transmission and analysis
public static bool SpaceWeather; // coronal mass ejections
public static bool Automation; // control vessel components using scripts
>>>>>>>
public static bool Reliability; // component malfunctions and critical failures
public static bool Deploy;
public static bool Science; // science data storage, transmission and analysis
public static bool SpaceWeather; // coronal mass ejections
public static bool Automation; // control vessel components using scripts |
<<<<<<<
this.Init(brokerIpAddress.ToString(), brokerPort, secure, caCert, sslProtocol, 0, null, null);
=======
this.Init(brokerIpAddress.ToString(), brokerPort, secure, caCert, clientCert, sslProtocol, null, null);
>>>>>>>
this.Init(brokerIpAddress.ToString(), brokerPort, secure, caCert, clientCert, sslProtocol, 0, null, null);
<<<<<<<
this(brokerHostName, MqttSettings.MQTT_BROKER_DEFAULT_PORT, false, null, MqttSslProtocols.None, 0)
=======
this(brokerHostName, MqttSettings.MQTT_BROKER_DEFAULT_PORT, false, null, null, MqttSslProtocols.None)
>>>>>>>
this(brokerHostName, MqttSettings.MQTT_BROKER_DEFAULT_PORT, false, null, null, MqttSslProtocols.None, 0)
<<<<<<<
public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, MqttSslProtocols sslProtocol, int connectTimeout)
=======
/// <param name="clientCert">Client certificate</param>
public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol)
>>>>>>>
/// <param name="clientCert">Client certificate</param>
public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol, int connectTimeout)
<<<<<<<
this.Init(brokerHostName, brokerPort, secure, caCert, sslProtocol, connectTimeout, null, null);
=======
this.Init(brokerHostName, brokerPort, secure, caCert, clientCert, sslProtocol, null, null);
>>>>>>>
this.Init(brokerHostName, brokerPort, secure, caCert, clientCert, sslProtocol, connectTimeout, null, null);
<<<<<<<
public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, MqttSslProtocols sslProtocol, int connectTimeout,
=======
public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol,
>>>>>>>
public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol, int connectTimeout,
<<<<<<<
: this(brokerHostName, brokerPort, secure, caCert, sslProtocol, connectTimeout, userCertificateValidationCallback, null)
=======
: this(brokerHostName, brokerPort, secure, caCert, clientCert, sslProtocol, userCertificateValidationCallback, null)
>>>>>>>
: this(brokerHostName, brokerPort, secure, caCert, clientCert, sslProtocol, connectTimeout, userCertificateValidationCallback, null)
<<<<<<<
: this(brokerHostName, brokerPort, secure, null, sslProtocol, connectTimeout, userCertificateValidationCallback, userCertificateSelectionCallback)
=======
: this(brokerHostName, brokerPort, secure, null, null, sslProtocol, userCertificateValidationCallback, userCertificateSelectionCallback)
>>>>>>>
: this(brokerHostName, brokerPort, secure, null, null, sslProtocol, connectTimeout, userCertificateValidationCallback, userCertificateSelectionCallback)
<<<<<<<
public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, MqttSslProtocols sslProtocol, int connectTimeout,
=======
public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol,
>>>>>>>
public MqttClient(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol, int connectTimeout,
<<<<<<<
this.Init(brokerHostName, brokerPort, secure, caCert, sslProtocol, connectTimeout, userCertificateValidationCallback, userCertificateSelectionCallback);
=======
this.Init(brokerHostName, brokerPort, secure, caCert, clientCert, sslProtocol, userCertificateValidationCallback, userCertificateSelectionCallback);
>>>>>>>
this.Init(brokerHostName, brokerPort, secure, caCert, clientCert, sslProtocol, connectTimeout, userCertificateValidationCallback, userCertificateSelectionCallback);
<<<<<<<
private void Init(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, MqttSslProtocols sslProtocol, int connectTimeout,
=======
private void Init(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol,
>>>>>>>
private void Init(string brokerHostName, int brokerPort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol, int connectTimeout,
<<<<<<<
this.channel = new MqttNetworkChannel(this.brokerHostName, this.brokerPort, secure, caCert, sslProtocol, connectTimeout, userCertificateValidationCallback, userCertificateSelectionCallback);
=======
this.channel = new MqttNetworkChannel(this.brokerHostName, this.brokerPort, secure, caCert, clientCert, sslProtocol, userCertificateValidationCallback, userCertificateSelectionCallback);
>>>>>>>
this.channel = new MqttNetworkChannel(this.brokerHostName, this.brokerPort, secure, caCert, clientCert, sslProtocol, connectTimeout, userCertificateValidationCallback, userCertificateSelectionCallback);
<<<<<<<
else if ((e.GetType() == typeof(System.IO.IOException)) || (e.GetType() == typeof(SocketException)) ||
=======
else if ((e.GetType() == typeof(IOException)) || (e.GetType() == typeof(SocketException)) ||
>>>>>>>
else if ((e.GetType() == typeof(IOException)) || (e.GetType() == typeof(SocketException)) || |
<<<<<<<
/// <summary>
/// Generates a web request to set the tier for a blob.
/// </summary>
/// <param name="uri">A <see cref="System.Uri"/> specifying the absolute URI to the blob.</param>
/// <param name="timeout">The server timeout interval, in seconds.</param>
/// <param name="blobTier">The blob tier to set as a string.</param>
/// <param name="accessCondition">An <see cref="AccessCondition"/> object that represents the condition that must be met in order for the request to proceed.</param>
/// <param name="useVersionHeader">A boolean value indicating whether to set the <i>x-ms-version</i> HTTP header.</param>
/// <param name="operationContext">An <see cref="OperationContext"/> object that represents the context for the current operation.</param>
/// <returns>A <see cref="System.Net.HttpWebRequest"/> object.</returns>
public static HttpWebRequest SetBlobTier(Uri uri, int? timeout, string blobTier, AccessCondition accessCondition, bool useVersionHeader, OperationContext operationContext)
{
UriQueryBuilder builder = new UriQueryBuilder();
builder.Add(Constants.QueryConstants.Component, "tier");
HttpWebRequest request = HttpWebRequestFactory.CreateWebRequest(WebRequestMethods.Http.Put, uri, timeout, builder, useVersionHeader, operationContext);
request.ApplyAccessCondition(accessCondition);
// Add the blob tier header
request.Headers.Add(Constants.HeaderConstants.AccessTierHeader, blobTier);
return request;
}
=======
/// <summary>
/// Generates a web request to set the tier for a blob.
/// </summary>
/// <param name="uri">A <see cref="System.Uri"/> specifying the absolute URI to the blob.</param>
/// <param name="timeout">The server timeout interval, in seconds.</param>
/// <param name="premiumPageBlobTier">The blob tier to set as a string.</param>
/// <param name="useVersionHeader">A boolean value indicating whether to set the <i>x-ms-version</i> HTTP header.</param>
/// <param name="operationContext">An <see cref="OperationContext"/> object that represents the context for the current operation.</param>
/// <returns>A <see cref="System.Net.HttpWebRequest"/> object.</returns>
public static HttpWebRequest SetBlobTier(Uri uri, int? timeout, string premiumPageBlobTier, bool useVersionHeader, OperationContext operationContext)
{
UriQueryBuilder builder = new UriQueryBuilder();
builder.Add(Constants.QueryConstants.Component, "tier");
HttpWebRequest request = HttpWebRequestFactory.CreateWebRequest(WebRequestMethods.Http.Put, uri, timeout, builder, useVersionHeader, operationContext);
// Add the blob tier header
request.Headers.Add(Constants.HeaderConstants.AccessTierHeader, premiumPageBlobTier);
return request;
}
>>>>>>>
/// <summary>
/// Generates a web request to set the tier for a blob.
/// </summary>
/// <param name="uri">A <see cref="System.Uri"/> specifying the absolute URI to the blob.</param>
/// <param name="timeout">The server timeout interval, in seconds.</param>
/// <param name="blobTier">The blob tier to set as a string.</param>
/// <param name="useVersionHeader">A boolean value indicating whether to set the <i>x-ms-version</i> HTTP header.</param>
/// <param name="operationContext">An <see cref="OperationContext"/> object that represents the context for the current operation.</param>
/// <returns>A <see cref="System.Net.HttpWebRequest"/> object.</returns>
public static HttpWebRequest SetBlobTier(Uri uri, int? timeout, string blobTier, bool useVersionHeader, OperationContext operationContext)
{
UriQueryBuilder builder = new UriQueryBuilder();
builder.Add(Constants.QueryConstants.Component, "tier");
HttpWebRequest request = HttpWebRequestFactory.CreateWebRequest(WebRequestMethods.Http.Put, uri, timeout, builder, useVersionHeader, operationContext);
// Add the blob tier header
request.Headers.Add(Constants.HeaderConstants.AccessTierHeader, blobTier);
return request;
} |
<<<<<<<
using MediaBrowser.Common.IO;
using MediaBrowser.Common.MediaInfo;
=======
using MediaBrowser.Common.MediaInfo;
>>>>>>>
using MediaBrowser.Common.IO;
using MediaBrowser.Common.MediaInfo; |
<<<<<<<
[SerializeField]
InspectorPreviewData m_PreviewData = new InspectorPreviewData();
=======
public IEnumerable<Guid> removedProperties
{
get { return m_RemovedProperties; }
}
#endregion
#region Node data
[NonSerialized]
Dictionary<Guid, INode> m_Nodes = new Dictionary<Guid, INode>();
>>>>>>>
public IEnumerable<Guid> removedProperties
{
get { return m_RemovedProperties; }
}
#endregion
#region Node data
[NonSerialized]
Dictionary<Guid, INode> m_Nodes = new Dictionary<Guid, INode>();
<<<<<<<
[Serializable]
=======
public void OnEnable()
{
foreach (var node in GetNodes<INode>().OfType<IOnAssetEnabled>())
{
node.OnEnable();
}
}
}
>>>>>>>
public void OnEnable()
{
foreach (var node in GetNodes<INode>().OfType<IOnAssetEnabled>())
{
node.OnEnable();
}
}
}
[Serializable] |
<<<<<<<
using System.Linq;
namespace Splunk.Client.UnitTests
=======
namespace Splunk.Client.UnitTesting
>>>>>>>
namespace Splunk.Client.UnitTests
<<<<<<<
=======
>>>>>>>
<<<<<<<
#endif
///// <summary>
///// Returns a value dermining whether a string is in the
///// non-ordered array of strings.
///// </summary>
///// <param name="array">The array to scan</param>
///// <param name="value">The value to look for</param>
///// <returns>True or false</returns>
//private bool Contains(string[] array, string value)
//{
// for (int i = 0; i < array.Length; ++i)
// {
// if (array[i].Equals(value))
// {
// return true;
// }
// }
// return false;
//}
=======
>>>>>>>
///// <summary>
///// Returns a value dermining whether a string is in the
///// non-ordered array of strings.
///// </summary>
///// <param name="array">The array to scan</param>
///// <param name="value">The value to look for</param>
///// <returns>True or false</returns>
//private bool Contains(string[] array, string value)
//{
// for (int i = 0; i < array.Length; ++i)
// {
// if (array[i].Equals(value))
// {
// return true;
// }
// }
// return false;
//} |
<<<<<<<
using Splunk.Client;
using Splunk.Client.Helper;
=======
>>>>>>> |
<<<<<<<
=======
Console.WriteLine(" # of inputs={0}.", inputsConfiguration.Count);
stopwatch.Start();
>>>>>>>
Console.WriteLine(" # of inputs={0}.", inputsConfiguration.Count);
stopwatch.Start(); |
<<<<<<<
using System;
using System.IO;
using System.Net;
using System.Text.RegularExpressions;
using Splunk.Client;
using Splunk.Client.Helper;
=======
>>>>>>> |
<<<<<<<
this.labelListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.openUsageMapFile = new System.Windows.Forms.OpenFileDialog();
this.ColumnAlias = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnPC = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnChar = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnHex = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnPoints = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnInstruction = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnIA = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnFlag = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnDB = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnDP = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnM = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnX = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnComment = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.openTraceLogDialog = new System.Windows.Forms.OpenFileDialog();
>>>>>>>
this.labelListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openUsageMapFile = new System.Windows.Forms.OpenFileDialog();
this.ColumnAlias = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnPC = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnChar = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnHex = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnPoints = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnInstruction = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnIA = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnFlag = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnDB = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnDP = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnM = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnX = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnComment = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.openTraceLogDialog = new System.Windows.Forms.OpenFileDialog();
<<<<<<<
this.table.Size = new System.Drawing.Size(700, 500);
this.table.TabIndex = 1;
this.table.TabStop = false;
=======
this.table.Size = new System.Drawing.Size(933, 615);
this.table.TabIndex = 0;
>>>>>>>
this.table.Size = new System.Drawing.Size(933, 615);
this.table.TabIndex = 1;
this.table.TabStop = false;
<<<<<<<
this.menuStrip1.Size = new System.Drawing.Size(717, 24);
this.menuStrip1.TabIndex = 0;
=======
this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2);
this.menuStrip1.Size = new System.Drawing.Size(956, 28);
this.menuStrip1.TabIndex = 1;
>>>>>>>
this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2);
this.menuStrip1.Size = new System.Drawing.Size(956, 28);
this.menuStrip1.TabIndex = 0;
<<<<<<<
this.viewToolStripMenuItem.Size = new System.Drawing.Size(46, 20);
=======
this.viewToolStripMenuItem.Size = new System.Drawing.Size(58, 24);
>>>>>>>
this.viewToolStripMenuItem.Size = new System.Drawing.Size(58, 24);
<<<<<<<
this.decimalToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
=======
this.decimalToolStripMenuItem.Size = new System.Drawing.Size(228, 26);
>>>>>>>
this.decimalToolStripMenuItem.Size = new System.Drawing.Size(228, 26);
<<<<<<<
this.hexadecimalToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
=======
this.hexadecimalToolStripMenuItem.Size = new System.Drawing.Size(228, 26);
>>>>>>>
this.hexadecimalToolStripMenuItem.Size = new System.Drawing.Size(228, 26);
<<<<<<<
this.binaryToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
=======
this.binaryToolStripMenuItem.Size = new System.Drawing.Size(228, 26);
>>>>>>>
this.binaryToolStripMenuItem.Size = new System.Drawing.Size(228, 26);
<<<<<<<
// optionsToolStripMenuItem
//
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.moveWithStepToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
this.optionsToolStripMenuItem.Text = "Options";
//
// moveWithStepToolStripMenuItem
//
this.moveWithStepToolStripMenuItem.Checked = true;
this.moveWithStepToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.moveWithStepToolStripMenuItem.Name = "moveWithStepToolStripMenuItem";
this.moveWithStepToolStripMenuItem.Size = new System.Drawing.Size(158, 22);
this.moveWithStepToolStripMenuItem.Text = "Move With Step";
this.moveWithStepToolStripMenuItem.Click += new System.EventHandler(this.moveWithStepToolStripMenuItem_Click);
//
=======
// optionsToolStripMenuItem
//
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.moveWithStepToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(264, 26);
this.optionsToolStripMenuItem.Text = "Options";
//
// moveWithStepToolStripMenuItem
//
this.moveWithStepToolStripMenuItem.Checked = true;
this.moveWithStepToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.moveWithStepToolStripMenuItem.Name = "moveWithStepToolStripMenuItem";
this.moveWithStepToolStripMenuItem.Size = new System.Drawing.Size(198, 26);
this.moveWithStepToolStripMenuItem.Text = "Move With Step";
this.moveWithStepToolStripMenuItem.Click += new System.EventHandler(this.moveWithStepToolStripMenuItem_Click);
//
>>>>>>>
// optionsToolStripMenuItem
//
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.moveWithStepToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(264, 26);
this.optionsToolStripMenuItem.Text = "Options";
//
// moveWithStepToolStripMenuItem
//
this.moveWithStepToolStripMenuItem.Checked = true;
this.moveWithStepToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.moveWithStepToolStripMenuItem.Name = "moveWithStepToolStripMenuItem";
this.moveWithStepToolStripMenuItem.Size = new System.Drawing.Size(198, 26);
this.moveWithStepToolStripMenuItem.Text = "Move With Step";
this.moveWithStepToolStripMenuItem.Click += new System.EventHandler(this.moveWithStepToolStripMenuItem_Click);
//
<<<<<<<
this.viewHelpToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
=======
this.viewHelpToolStripMenuItem.Size = new System.Drawing.Size(184, 26);
>>>>>>>
this.viewHelpToolStripMenuItem.Size = new System.Drawing.Size(184, 26);
<<<<<<<
this.githubToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
=======
this.githubToolStripMenuItem.Size = new System.Drawing.Size(184, 26);
>>>>>>>
this.githubToolStripMenuItem.Size = new System.Drawing.Size(184, 26);
<<<<<<<
this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
=======
this.aboutToolStripMenuItem.Size = new System.Drawing.Size(184, 26);
>>>>>>>
this.aboutToolStripMenuItem.Size = new System.Drawing.Size(184, 26);
<<<<<<<
this.statusStrip1.Size = new System.Drawing.Size(717, 22);
this.statusStrip1.TabIndex = 3;
=======
this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
this.statusStrip1.Size = new System.Drawing.Size(956, 26);
this.statusStrip1.TabIndex = 2;
>>>>>>>
this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
this.statusStrip1.Size = new System.Drawing.Size(956, 26);
this.statusStrip1.TabIndex = 3;
<<<<<<<
this.vScrollBar1.Size = new System.Drawing.Size(17, 500);
this.vScrollBar1.TabIndex = 2;
=======
this.vScrollBar1.Size = new System.Drawing.Size(17, 615);
this.vScrollBar1.TabIndex = 3;
>>>>>>>
this.vScrollBar1.Size = new System.Drawing.Size(17, 615);
this.vScrollBar1.TabIndex = 2;
<<<<<<<
private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem moveWithStepToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem labelListToolStripMenuItem;
=======
private System.Windows.Forms.OpenFileDialog openTraceLogDialog;
>>>>>>>
private System.Windows.Forms.OpenFileDialog openTraceLogDialog;
private System.Windows.Forms.ToolStripMenuItem labelListToolStripMenuItem; |
<<<<<<<
aliasList = new AliasList(this);
=======
UpdatePanels();
>>>>>>>
aliasList = new AliasList(this);
UpdatePanels();
<<<<<<<
// sub windows
AliasList aliasList;
private void EnableSubWindows()
{
labelListToolStripMenuItem.Enabled = true;
}
private void labelListToolStripMenuItem_Click(object sender, EventArgs e)
{
aliasList.Show();
}
=======
private void ImportUsageMapToolStripMenuItem_Click(object sender, EventArgs e)
{
if (openUsageMapFile.ShowDialog() == DialogResult.OK)
{
int total = Manager.ImportUsageMap(File.ReadAllBytes(openUsageMapFile.FileName));
MessageBox.Show($"Modified total {total} flags!", "Done",
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
private void ImportTraceLogToolStripMenuItem_Click(object sender, EventArgs e)
{
if (openTraceLogDialog.ShowDialog() == DialogResult.OK)
{
int total = Manager.ImportTraceLog(File.ReadAllLines(openTraceLogDialog.FileName));
MessageBox.Show($"Modified total {total} flags!", "Done",
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
>>>>>>>
// sub windows
AliasList aliasList;
private void EnableSubWindows()
{
labelListToolStripMenuItem.Enabled = true;
}
private void labelListToolStripMenuItem_Click(object sender, EventArgs e)
{
aliasList.Show();
}
private void ImportUsageMapToolStripMenuItem_Click(object sender, EventArgs e)
{
if (openUsageMapFile.ShowDialog() == DialogResult.OK)
{
int total = Manager.ImportUsageMap(File.ReadAllBytes(openUsageMapFile.FileName));
MessageBox.Show($"Modified total {total} flags!", "Done",
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
private void ImportTraceLogToolStripMenuItem_Click(object sender, EventArgs e)
{
if (openTraceLogDialog.ShowDialog() == DialogResult.OK)
{
int total = Manager.ImportTraceLog(File.ReadAllLines(openTraceLogDialog.FileName));
MessageBox.Show($"Modified total {total} flags!", "Done",
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
} |
<<<<<<<
public const int MaxNameLength = 50;
public const int MaxPhoneNumberLength = 11;
public const int MaxEmailAddressLength = 80;
public const int MaxAddressLength = 200;
=======
/// <summary>
/// 名字最大长度
/// </summary>
public const int MaxNameLength = 32;
/// <summary>
/// Default page size for paged requests.
/// </summary>
public const int DefaultPageSize = 10;
/// <summary>
/// Maximum allowed page size for paged requests.
/// </summary>
public const int MaxPageSize = 1000;
/// <summary>
/// 邮件地址最大长度
/// </summary>
public const int MaxEmailAddressLength = 255;
>>>>>>>
/// <summary>
/// 名字最大长度
/// </summary>
public const int MaxNameLength = 32;
/// <summary>
/// Default page size for paged requests.
/// </summary>
public const int DefaultPageSize = 10;
/// <summary>
/// Maximum allowed page size for paged requests.
/// </summary>
public const int MaxPageSize = 1000;
/// <summary>
/// 邮件地址最大长度
/// </summary>
public const int MaxEmailAddressLength = 255;
public const int MaxNameLength = 50;
public const int MaxPhoneNumberLength = 11;
public const int MaxEmailAddressLength = 80;
public const int MaxAddressLength = 200; |
<<<<<<<
[TestMethod]
public void TestFromLson01()
{
dynamic t = LuaTable.FromLson("{ a = true, b = false, c = 10, d = 1099511627776, e = 'test', f = 1.0, g = 1.23, h = 1e10 }");
TestResult(new LuaResult(t.a, t.b, t.c, t.d, t.e, t.f, t.g, t.h), true, false, 10, 1099511627776L, "test", 1.0, 1.23, 1e10);
}
=======
[TestMethod]
public void TestLsonInt64MinValue()
{
var t = new LuaTable()
{
["test"] = Int64.MinValue
};
Assert.AreEqual(Int64.MinValue, LuaTable.FromLson(t.ToLson())["test"]);
}
[TestMethod]
public void TestLsonDouble()
{
var t = new LuaTable()
{
["test"] = 1.0
};
Assert.AreEqual(1.0, LuaTable.FromLson(t.ToLson())["test"]);
}
[TestMethod]
public void TestLsonSpecialChars()
{
LuaTable t;
t = new LuaTable()
{
["string_unicode"] = "ⓛ",
["string_esc1"] = "\0",
["string2"] = "\"",
["stringⓛ3"] = "test",
["stri\nng4"] = "test",
["stri\\nng5"] = "test",
["stri\\\nng6"] = "test",
["stri{ng7"] = "test",
["{[\"stri{ng7\"]=\"test\"}8"] = "test",
["stri\x4e00ng9"] = "test"
};
var result = LuaTable.FromLson(t.ToLson());
Assert.AreEqual("ⓛ", result["string_unicode"]);
Assert.AreEqual("\0", result["string_esc1"]);
Assert.AreEqual("\"", result["string2"]);
Assert.AreEqual("test", result["stringⓛ3"]);
Assert.AreEqual("test", result["stri\nng4"]);
Assert.AreEqual("test", result["stri\\nng5"]);
Assert.AreEqual("test", result["stri\\\nng6"]);
Assert.AreEqual("test", result["stri{ng7"]);
Assert.AreEqual("test", result["{[\"stri{ng7\"]=\"test\"}8"]);
Assert.AreEqual("test", result["stri\x4e00ng9"]);
t = new LuaTable()
{
["test1"] = "_test"
};
Assert.AreEqual("_test", LuaTable.FromLson(t.ToLson())["test1"]);
t = new LuaTable()
{
["_test2"] = "test"
};
Assert.AreEqual("test", LuaTable.FromLson(t.ToLson())["_test2"]);
var keywords = (
from fi in typeof(LuaToken).GetTypeInfo().DeclaredFields
let a = fi.GetCustomAttribute<TokenNameAttribute>()
where a != null && fi.IsStatic && fi.Name.StartsWith("Kw")
orderby a.Name
select a.Name
).ToArray();
foreach (var keyword in keywords)
{
t = new LuaTable()
{
[keyword] = "test"
};
Assert.IsTrue(t.ToLson(false).IndexOf($"[\"{keyword}\"]") >= 0);
}
foreach (var keyword in keywords)
{
try
{
var tt = LuaTable.FromLson("{" + keyword + "=\"test\"}");
Assert.Fail("A keyword was parsed as a member name.");
}
catch (LuaParseException)
{ }
}
}
[TestMethod]
public void TestLsonParser()
{
LuaTable t;
t = LuaTable.FromLson("{test=\"1.0\"}");
Assert.AreEqual(typeof(string), t["test"].GetType());
t = LuaTable.FromLson("{test=1.0}");
Assert.AreEqual(1.0, t["test"]);
t = LuaTable.FromLson("{test=1.}");
Assert.AreEqual(1.0, t["test"]);
t = LuaTable.FromLson("{test=1}");
Assert.AreEqual(1, t["test"]);
t = LuaTable.FromLson("{test=" + Int64.MaxValue + "0" + "}");
Assert.AreEqual(Int64.MaxValue * 10.0, t["test"]);
try
{
t = LuaTable.FromLson("{test=_test}");
Assert.Fail("Value starting with underscore must not be parsed");
}
catch (LuaParseException)
{ }
try
{
t = LuaTable.FromLson("{test=" + Double.PositiveInfinity.ToString() + "}");
Assert.Fail("Illegal number parsed without Error.");
}
catch (LuaParseException)
{ }
}
[TestMethod]
public void TestLsonNumberBoundaries()
{
try
{
var t = LuaTable.FromLson("{test=" + Double.MaxValue + "0" + "}");
Assert.Fail("Illegal number parsed without Error.");
}
catch (LuaParseException)
{ }
}
/// <summary>
/// Some of the testcases require unpretty Lson to have a standart format
/// </summary>
[TestMethod]
public void TestLsonUnpretty()
{
LuaTable t;
t = new LuaTable()
{
["string_unicode"] = "ⓛ",
["string_esc1"] = "\0",
["string2"] = "\"",
["stringⓛ3"] = "test",
["stri\nng4 "] = "test",
["stri\\nng5"] = "test ",
["stri\\\nng6"] = "test",
["stri{ng7"] = "test",
["{[\"stri{ng7\"]=\"test\"}8"] = "test",
["stri\x4e00ng9"] = "test"
};
var s = t.ToLson(false);
var hyphen = 0;
for (var i = 0; i < s.Length; i++)
{
if (s[i] == '"')
{
hyphen++;
continue;
}
if (hyphen % 2 == 1)
{
// the character is not escaped
switch (s[i])
{
case ' ':
Assert.Fail("Unprettyfied Lson must not include whitespaces.");
break;
case '\t':
Assert.Fail("Unprettyfied Lson must not include tabs.");
break;
case '\v':
Assert.Fail("Unprettyfied Lson must not include vertical tabs.");
break;
case '\r':
Assert.Fail("Unprettyfied Lson must not include newline.");
break;
case '\n':
Assert.Fail("Unprettyfied Lson must not include newline.");
break;
}
}
}
}
[TestMethod]
public void TestLsonTypes()
{
LuaTable t;
var timestamp = DateTime.Now;
var guid = Guid.NewGuid();
t = new LuaTable()
{
["int64max"] = Int64.MaxValue,
["uint64"] = UInt64.MaxValue,
["string"] = "test",
["char"] = '+',
["DateTime"] = timestamp,
["Guid"] = guid
};
var result = LuaTable.FromLson(t.ToLson());
Assert.AreEqual(Int64.MaxValue, result["int64max"]);
Assert.AreEqual(UInt64.MaxValue, result["uint64"]);
Assert.AreEqual("test", result["string"]);
Assert.AreEqual("+", result["char"]);
Assert.AreEqual(timestamp.ToString(System.Globalization.CultureInfo.InvariantCulture), result["DateTime"]);
Assert.AreEqual(guid.ToString(), result["Guid"]);
}
[TestMethod]
public void TestLsonDateTime()
{
var timestamp = DateTime.Now;
var t = new LuaTable()
{
["today"] = timestamp
};
Assert.IsTrue(t.ToLson().IndexOf("\"" + timestamp.ToString(System.Globalization.CultureInfo.InvariantCulture) + "\"") >= 0);
}
[TestMethod]
public void TestLsonGuid()
{
var guid = Guid.NewGuid();
var t = new LuaTable()
{
["guid"] = guid
};
Assert.IsTrue(t.ToLson().IndexOf("\"" + guid.ToString() + "\"") >= 0);
}
[TestMethod]
public void TestLsonCharArray()
{
var chara = "test".ToCharArray();
var t = new LuaTable()
{
["chararray"] = chara
};
Assert.IsTrue(t.ToLson().IndexOf("\"" + chara.ToString() + "\"") >= 0);
}
>>>>>>>
[TestMethod]
public void TestLsonInt64MinValue()
{
var t = new LuaTable()
{
["test"] = Int64.MinValue
};
Assert.AreEqual(Int64.MinValue, LuaTable.FromLson(t.ToLson())["test"]);
}
[TestMethod]
public void TestLsonDouble()
{
var t = new LuaTable()
{
["test"] = 1.0
};
Assert.AreEqual(1.0, LuaTable.FromLson(t.ToLson())["test"]);
}
[TestMethod]
public void TestLsonSpecialChars()
{
LuaTable t;
t = new LuaTable()
{
["string_unicode"] = "ⓛ",
["string_esc1"] = "\0",
["string2"] = "\"",
["stringⓛ3"] = "test",
["stri\nng4"] = "test",
["stri\\nng5"] = "test",
["stri\\\nng6"] = "test",
["stri{ng7"] = "test",
["{[\"stri{ng7\"]=\"test\"}8"] = "test",
["stri\x4e00ng9"] = "test"
};
var result = LuaTable.FromLson(t.ToLson());
Assert.AreEqual("ⓛ", result["string_unicode"]);
Assert.AreEqual("\0", result["string_esc1"]);
Assert.AreEqual("\"", result["string2"]);
Assert.AreEqual("test", result["stringⓛ3"]);
Assert.AreEqual("test", result["stri\nng4"]);
Assert.AreEqual("test", result["stri\\nng5"]);
Assert.AreEqual("test", result["stri\\\nng6"]);
Assert.AreEqual("test", result["stri{ng7"]);
Assert.AreEqual("test", result["{[\"stri{ng7\"]=\"test\"}8"]);
Assert.AreEqual("test", result["stri\x4e00ng9"]);
t = new LuaTable()
{
["test1"] = "_test"
};
Assert.AreEqual("_test", LuaTable.FromLson(t.ToLson())["test1"]);
t = new LuaTable()
{
["_test2"] = "test"
};
Assert.AreEqual("test", LuaTable.FromLson(t.ToLson())["_test2"]);
var keywords = (
from fi in typeof(LuaToken).GetTypeInfo().DeclaredFields
let a = fi.GetCustomAttribute<TokenNameAttribute>()
where a != null && fi.IsStatic && fi.Name.StartsWith("Kw")
orderby a.Name
select a.Name
).ToArray();
foreach (var keyword in keywords)
{
t = new LuaTable()
{
[keyword] = "test"
};
Assert.IsTrue(t.ToLson(false).IndexOf($"[\"{keyword}\"]") >= 0);
}
foreach (var keyword in keywords)
{
try
{
var tt = LuaTable.FromLson("{" + keyword + "=\"test\"}");
Assert.Fail("A keyword was parsed as a member name.");
}
catch (LuaParseException)
{ }
}
}
[TestMethod]
public void TestLsonParser()
{
LuaTable t;
t = LuaTable.FromLson("{test=\"1.0\"}");
Assert.AreEqual(typeof(string), t["test"].GetType());
t = LuaTable.FromLson("{test=1.0}");
Assert.AreEqual(1.0, t["test"]);
t = LuaTable.FromLson("{test=1.}");
Assert.AreEqual(1.0, t["test"]);
t = LuaTable.FromLson("{test=1}");
Assert.AreEqual(1, t["test"]);
t = LuaTable.FromLson("{test=" + Int64.MaxValue + "0" + "}");
Assert.AreEqual(Int64.MaxValue * 10.0, t["test"]);
try
{
t = LuaTable.FromLson("{test=_test}");
Assert.Fail("Value starting with underscore must not be parsed");
}
catch (LuaParseException)
{ }
try
{
t = LuaTable.FromLson("{test=" + Double.PositiveInfinity.ToString() + "}");
Assert.Fail("Illegal number parsed without Error.");
}
catch (LuaParseException)
{ }
}
[TestMethod]
public void TestLsonNumberBoundaries()
{
try
{
var t = LuaTable.FromLson("{test=" + Double.MaxValue + "0" + "}");
Assert.Fail("Illegal number parsed without Error.");
}
catch (LuaParseException)
{ }
}
/// <summary>
/// Some of the testcases require unpretty Lson to have a standart format
/// </summary>
[TestMethod]
public void TestLsonUnpretty()
{
LuaTable t;
t = new LuaTable()
{
["string_unicode"] = "ⓛ",
["string_esc1"] = "\0",
["string2"] = "\"",
["stringⓛ3"] = "test",
["stri\nng4 "] = "test",
["stri\\nng5"] = "test ",
["stri\\\nng6"] = "test",
["stri{ng7"] = "test",
["{[\"stri{ng7\"]=\"test\"}8"] = "test",
["stri\x4e00ng9"] = "test"
};
var s = t.ToLson(false);
var hyphen = 0;
for (var i = 0; i < s.Length; i++)
{
if (s[i] == '"')
{
hyphen++;
continue;
}
if (hyphen % 2 == 1)
{
// the character is not escaped
switch (s[i])
{
case ' ':
Assert.Fail("Unprettyfied Lson must not include whitespaces.");
break;
case '\t':
Assert.Fail("Unprettyfied Lson must not include tabs.");
break;
case '\v':
Assert.Fail("Unprettyfied Lson must not include vertical tabs.");
break;
case '\r':
Assert.Fail("Unprettyfied Lson must not include newline.");
break;
case '\n':
Assert.Fail("Unprettyfied Lson must not include newline.");
break;
}
}
}
}
[TestMethod]
public void TestLsonTypes()
{
LuaTable t;
var timestamp = DateTime.Now;
var guid = Guid.NewGuid();
t = new LuaTable()
{
["int64max"] = Int64.MaxValue,
["uint64"] = UInt64.MaxValue,
["string"] = "test",
["char"] = '+',
["DateTime"] = timestamp,
["Guid"] = guid
};
var result = LuaTable.FromLson(t.ToLson());
Assert.AreEqual(Int64.MaxValue, result["int64max"]);
Assert.AreEqual(UInt64.MaxValue, result["uint64"]);
Assert.AreEqual("test", result["string"]);
Assert.AreEqual("+", result["char"]);
Assert.AreEqual(timestamp.ToString(System.Globalization.CultureInfo.InvariantCulture), result["DateTime"]);
Assert.AreEqual(guid.ToString(), result["Guid"]);
}
[TestMethod]
public void TestLsonDateTime()
{
var timestamp = DateTime.Now;
var t = new LuaTable()
{
["today"] = timestamp
};
Assert.IsTrue(t.ToLson().IndexOf("\"" + timestamp.ToString(System.Globalization.CultureInfo.InvariantCulture) + "\"") >= 0);
}
[TestMethod]
public void TestLsonGuid()
{
var guid = Guid.NewGuid();
var t = new LuaTable()
{
["guid"] = guid
};
Assert.IsTrue(t.ToLson().IndexOf("\"" + guid.ToString() + "\"") >= 0);
}
[TestMethod]
public void TestLsonCharArray()
{
var chara = "test".ToCharArray();
var t = new LuaTable()
{
["chararray"] = chara
};
Assert.IsTrue(t.ToLson().IndexOf("\"" + chara.ToString() + "\"") >= 0);
}
[TestMethod]
public void TestFromLson01()
{
dynamic t = LuaTable.FromLson("{ a = true, b = false, c = 10, d = 1099511627776, e = 'test', f = 1.0, g = 1.23, h = 1e10 }");
TestResult(new LuaResult(t.a, t.b, t.c, t.d, t.e, t.f, t.g, t.h), true, false, 10, 1099511627776L, "test", 1.0, 1.23, 1e10);
} |
<<<<<<<
.AddWorkScopes("Doors", "Doors-Metal", "Here's a work scope Description")
.AddVendor("Doors")
.ClickBidRequests()
.CreateNewBidRequest("10", "13.99")
.ClickProposalTab()
.CreateNewProposal("[email protected]");
// .AddVendors("Doors")
// .AddBidRequest()
// .EditBidRequests("10", "13.99")
////.NewProposal("Items"); --Cannot FINISH PROPOSAL as of 06/27/13
// .NewWorkOrder("07/04/2013", "Proto", "Test");
=======
.AddWorkScopes("Doors", "Doors-Metal", "Here's a work scope Description");
// .AddVendors("Doors")
// .AddBidRequest()
// .EditBidRequests("10", "13.99")
//.NewProposal("Items"); --Cannot FINISH PROPOSAL as of 06/27/13
// .NewWorkOrder("07/04/2013", "Proto", "Test");
>>>>>>>
.AddWorkScopes("Doors", "Doors-Metal", "Here's a work scope Description")
.AddVendor("Doors")
.ClickBidRequests()
.CreateNewBidRequest("10", "13.99")
.ClickProposalTab()
.CreateNewProposal("[email protected]");
// .AddVendors("Doors")
// .AddBidRequest()
// .EditBidRequests("10", "13.99")
////.NewProposal("Items"); --Cannot FINISH PROPOSAL as of 06/27/13
// .NewWorkOrder("07/04/2013", "Proto", "Test");
// .AddWorkScopes("Doors", "Doors-Metal", "Here's a work scope Description");
// .AddVendors("Doors")
// .AddBidRequest()
// .EditBidRequests("10", "13.99")
//.NewProposal("Items"); --Cannot FINISH PROPOSAL as of 06/27/13
// .NewWorkOrder("07/04/2013", "Proto", "Test"); |
<<<<<<<
public bool GetSosOnlineContent()
{
if (SosOnlineAlwaysOffline) return false;
// if someone doesn't want to check for the lastest software, they probably are on a private network and don't want random connections to SoS Online
if (UpdateLocation != UpdateLocation.Auto) return false;
return true;
}
=======
public IWebProxy GetSosOnlineProxy()
{
if (string.IsNullOrEmpty(SosOnlineProxyUrl)) return null;
return new WebProxy(
SosOnlineProxyUrl,
false,
new string[] { },
new NetworkCredential(SosOnlineProxyUsername, GetSosOnlinePassword())
);
}
>>>>>>>
public bool GetSosOnlineContent()
{
if (SosOnlineAlwaysOffline) return false;
// if someone doesn't want to check for the lastest software, they probably are on a private network and don't want random connections to SoS Online
if (UpdateLocation != UpdateLocation.Auto) return false;
return true;
}
public IWebProxy GetSosOnlineProxy()
{
if (string.IsNullOrEmpty(SosOnlineProxyUrl)) return null;
return new WebProxy(
SosOnlineProxyUrl,
false,
new string[] { },
new NetworkCredential(SosOnlineProxyUsername, GetSosOnlinePassword())
);
} |
<<<<<<<
try
{
await CreateQueueAsync(namespaceManager, path, requiresSessions, maxDeliveryCount);
}
catch (MessagingEntityAlreadyExistsException)
{
await Task.FromResult(0);
}
}, null, "SafeCreateQueueAsync", 3, 5);
=======
await CreateQueueAsync(namespaceManager, path, requiresSessions, requiresDuplicateDetection, maxDeliveryCount);
}
catch (MessagingEntityAlreadyExistsException)
{
await Task.FromResult(0);
}
>>>>>>>
try
{
await CreateQueueAsync(namespaceManager, path, requiresSessions, requiresDuplicateDetection, maxDeliveryCount);
}
catch (MessagingEntityAlreadyExistsException)
{
await Task.FromResult(0);
}
}, null, "SafeCreateQueueAsync", 3, 5);
<<<<<<<
await SafeCreateQueueAsync(namespaceManager, path, requiresSessions, maxDeliveryCount);
=======
await CreateQueueAsync(namespaceManager, path, requiresSessions, requiresDuplicateDetection, maxDeliveryCount);
>>>>>>>
await SafeCreateQueueAsync(namespaceManager, path, requiresSessions, requiresDuplicateDetection, maxDeliveryCount); |
<<<<<<<
return this.StartCopy(source, default(StandardBlobTier?) /*standardBlockBlobTier*/, sourceAccessCondition, destAccessCondition, options, operationContext);
}
/// <summary>
/// Begins an operation to start copying another block blob's contents, properties, and metadata to this block blob.
/// </summary>
/// <param name="source">A <see cref="CloudBlockBlob"/> object.</param>
/// <param name="standardBlockBlobTier">A <see cref="StandardBlobTier"/> representing the tier to set.</param>
/// <param name="sourceAccessCondition">An <see cref="AccessCondition"/> object that represents the access conditions for the source blob. If <c>null</c>, no condition is used.</param>
/// <param name="destAccessCondition">An <see cref="AccessCondition"/> object that represents the access conditions for the destination blob. If <c>null</c>, no condition is used.</param>
/// <param name="options">A <see cref="BlobRequestOptions"/> object that specifies additional options for the request. If <c>null</c>, default options are applied to the request.</param>
/// <param name="operationContext">An <see cref="OperationContext"/> object that represents the context for the current operation.</param>
/// <returns>The copy ID associated with the copy operation.</returns>
/// <remarks>
/// This method fetches the blob's ETag, last-modified time, and part of the copy state.
/// The copy ID and copy status fields are fetched, and the rest of the copy state is cleared.
/// </remarks>
[DoesServiceRequest]
public virtual string StartCopy(CloudBlockBlob source, StandardBlobTier? standardBlockBlobTier, AccessCondition sourceAccessCondition = null, AccessCondition destAccessCondition = null, BlobRequestOptions options = null, OperationContext operationContext = null)
{
return this.StartCopy(source, default(string) /* contentMD5 */, false /* syncCopy */, standardBlockBlobTier, sourceAccessCondition, destAccessCondition, options, operationContext);
=======
return this.StartCopy(source, default(string) /* contentMD5 */, false /* syncCopy */, rehydratePriority, sourceAccessCondition, destAccessCondition, options, operationContext);
>>>>>>>
return this.StartCopy(source, default(string) /* contentMD5 */, false /* syncCopy */, standardBlockBlobTier, rehydratePriority, sourceAccessCondition, destAccessCondition, options, operationContext);
<<<<<<<
return this.StartCopyAsync(source, default(StandardBlobTier?) /*standardBlockBlobTier*/, default(AccessCondition) /*sourceAccessCondition*/, default(AccessCondition) /*destAccessCondition*/, default(BlobRequestOptions), default(OperationContext), CancellationToken.None);
=======
return this.StartCopyAsync(source, default(RehydratePriority?), default(AccessCondition) /*sourceAccessCondition*/, default(AccessCondition) /*destAccessCondition*/, default(BlobRequestOptions), default(OperationContext), CancellationToken.None);
>>>>>>>
return this.StartCopyAsync(source, default(StandardBlobTier?), default(RehydratePriority?), default(AccessCondition) /*sourceAccessCondition*/, default(AccessCondition) /*destAccessCondition*/, default(BlobRequestOptions), default(OperationContext), CancellationToken.None);
<<<<<<<
return this.StartCopyAsync(source, default(StandardBlobTier?) /*standardBlockBlobTier*/, default(AccessCondition) /*sourceAccessCondition*/, default(AccessCondition) /*destAccessCondition*/, default(BlobRequestOptions), default(OperationContext), cancellationToken);
=======
return this.StartCopyAsync(source, default(RehydratePriority?), default(AccessCondition) /*sourceAccessCondition*/, default(AccessCondition) /*destAccessCondition*/, default(BlobRequestOptions), default(OperationContext), cancellationToken);
>>>>>>>
return this.StartCopyAsync(source, default(StandardBlobTier?), default(RehydratePriority?), default(AccessCondition) /*sourceAccessCondition*/, default(AccessCondition) /*destAccessCondition*/, default(BlobRequestOptions), default(OperationContext), cancellationToken);
<<<<<<<
this.StartCopyImpl(this.attributes, CloudBlob.SourceBlobToUri(source), contentMD5, incrementalCopy, syncCopy, default(PremiumPageBlobTier?), standardBlockBlobTier, sourceAccessCondition, destAccessCondition, modifiedOptions),
=======
this.StartCopyImpl(this.attributes, CloudBlob.SourceBlobToUri(source), contentMD5, incrementalCopy, syncCopy, default(PremiumPageBlobTier?), rehydratePriority, sourceAccessCondition, destAccessCondition, modifiedOptions),
>>>>>>>
this.StartCopyImpl(this.attributes, CloudBlob.SourceBlobToUri(source), contentMD5, incrementalCopy, syncCopy, default(PremiumPageBlobTier?), standardBlockBlobTier, rehydratePriority, sourceAccessCondition, destAccessCondition, modifiedOptions),
<<<<<<<
internal RESTCommand<NullType> SetStandardBlobTierImpl(StandardBlobTier standardBlobTier, AccessCondition accessCondition, BlobRequestOptions options)
=======
private RESTCommand<NullType> SetStandardBlobTierImpl(StandardBlobTier standardBlobTier, RehydratePriority? rehydratePriority, AccessCondition accessCondition, BlobRequestOptions options)
>>>>>>>
internal RESTCommand<NullType> SetStandardBlobTierImpl(StandardBlobTier standardBlobTier, RehydratePriority? rehydratePriority, AccessCondition accessCondition, BlobRequestOptions options)
<<<<<<<
putCmd.BuildRequest = (cmd, uri, builder, cnt, serverTimeout, ctx) => BlobHttpRequestMessageFactory.SetBlobTier(uri, serverTimeout, standardBlobTier.ToString(), cnt, ctx,
this.ServiceClient.GetCanonicalizer(), this.ServiceClient.Credentials);
=======
putCmd.BuildRequest = (cmd, uri, builder, cnt, serverTimeout, ctx) => BlobHttpRequestMessageFactory.SetBlobTier(uri, serverTimeout, standardBlobTier.ToString(), rehydratePriority, cnt, ctx, this.ServiceClient.GetCanonicalizer(), this.ServiceClient.Credentials);
>>>>>>>
putCmd.BuildRequest = (cmd, uri, builder, cnt, serverTimeout, ctx) => BlobHttpRequestMessageFactory.SetBlobTier(uri, serverTimeout, standardBlobTier.ToString(), rehydratePriority, cnt, ctx, this.ServiceClient.GetCanonicalizer(), this.ServiceClient.Credentials); |
<<<<<<<
[FileType.Hps] = new Hps(),
=======
[FileType.Adx] = new Adx(),
>>>>>>>
[FileType.Hps] = new Hps(),
[FileType.Adx] = new Adx(), |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.