Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added lib/18.0/Microsoft.TeamFoundation.Client.dll
Binary file not shown.
Binary file added lib/18.0/Microsoft.TeamFoundation.Common.dll
Binary file not shown.
Binary file added lib/18.0/Microsoft.TeamFoundation.Controls.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added lib/18.0/Newtonsoft.Json.dll
Binary file not shown.
Binary file added screenshots/standalone-branches-update.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ root = true
end_of_line = crlf
insert_final_newline = true
indent_style = space
indent_size = 4
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true

Expand Down
91 changes: 91 additions & 0 deletions src/AutoMerge.Standalone/AddChangesetByIdDialog.Designer.cs

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

35 changes: 35 additions & 0 deletions src/AutoMerge.Standalone/AddChangesetByIdDialog.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using System;
using System.Windows.Forms;

namespace AutoMerge.Standalone
{
public partial class AddChangesetByIdDialog : Form
{
public int ChangesetId { get; private set; }

public AddChangesetByIdDialog()
{
InitializeComponent();
}

private void btnOk_Click(object sender, EventArgs e)
{
if (int.TryParse(txtChangesetId.Text, out int id) && id > 0)
{
ChangesetId = id;
DialogResult = DialogResult.OK;
Close();
}
else
{
MessageBox.Show("Please enter a valid changeset ID.", "Invalid Input", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
}

private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}
}
}
6 changes: 6 additions & 0 deletions src/AutoMerge.Standalone/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
</configuration>
168 changes: 168 additions & 0 deletions src/AutoMerge.Standalone/AutoMerge.Standalone.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{8B9A3C2D-5F6E-4A1B-9C3D-2E4F5A6B7C8D}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>AutoMerge.Standalone</RootNamespace>
<AssemblyName>AutoMerge.Standalone</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.TeamFoundation.Core.WebApi">
<HintPath>..\..\lib\18.0\Microsoft.TeamFoundation.Core.WebApi.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.Services.Client.Interactive">
<HintPath>..\..\lib\18.0\Microsoft.VisualStudio.Services.Client.Interactive.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsFormsIntegration" />
<Reference Include="Microsoft.TeamFoundation.Client">
<HintPath>..\..\lib\18.0\Microsoft.TeamFoundation.Client.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.TeamFoundation.Common">
<HintPath>..\..\lib\18.0\Microsoft.TeamFoundation.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.TeamFoundation.Controls">
<HintPath>..\..\lib\18.0\Microsoft.TeamFoundation.Controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.TeamFoundation.VersionControl.Client">
<HintPath>..\..\lib\18.0\Microsoft.TeamFoundation.VersionControl.Client.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.TeamFoundation.VersionControl.Common">
<HintPath>..\..\lib\18.0\Microsoft.TeamFoundation.VersionControl.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.TeamFoundation.WorkItemTracking.Client">
<HintPath>..\..\lib\18.0\Microsoft.TeamFoundation.WorkItemTracking.Client.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Services.Common">
<HintPath>..\..\lib\18.0\Microsoft.VisualStudio.Services.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Services.WebApi">
<HintPath>..\..\lib\18.0\Microsoft.VisualStudio.Services.WebApi.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\lib\18.0\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
</ItemGroup>
<!-- Default case: use the VisualStudioVersion variable -->
<ItemGroup Condition="'$(VisualStudioVersion)' != '18.0'">
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(VisualStudioVersion).*" PrivateAssets="All" />
</ItemGroup>
<!-- Special case: VS2026 (VisualStudioVersion = 18.0) -->
<ItemGroup Condition="'$(VisualStudioVersion)' == '18.0'">
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.*" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="17.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Framework" Version="17.*" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Compile Include="AddChangesetByIdDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AddChangesetByIdDialog.Designer.cs">
<DependentUpon>AddChangesetByIdDialog.cs</DependentUpon>
</Compile>
<Compile Include="AutoMergeControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="AutoMergeControl.Designer.cs">
<DependentUpon>AutoMergeControl.cs</DependentUpon>
</Compile>
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="StandaloneServiceProvider.cs" />
<Compile Include="StandaloneLogger.cs" />
<EmbeddedResource Include="AutoMergeControl.resx">
<DependentUpon>AutoMergeControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AutoMerge\AutoMerge.csproj">
<Project>{726ED85E-2274-4D95-B822-B2CFE2CE44B9}</Project>
<Name>AutoMerge</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Loading