Today the standard source control with Visual Studio is GIT. This source control has a lot of powerful features and options.
For me it took some investigation, testing and searching the internet on how to best merge a development branch (or a bugfix branch, etc.) into the main (master) branch.
git checkout master git merge –squash Development git commit OR git commit -m “This is a merge from branch to branch at moment x”
What these commands will do is compact all commits to the development branch and add them to the master in one separate commit.
ATTENTION: When you check the source tree you will also notice that there is NO “merge branch” line.
Next I have added an extra branch, commit a change. Last action was to merge the branch using “git merge HotfixOnMaster”:
After merging a complete branch without squashing. Every commit remains in the master history:
Alternative found on makandracards.com: Squash several Git commits into a single commit This note shows how to merge an ugly feature branch with multiple dirty WIP commits back into the master as one pretty commit.
git checkout master # Switch to the master branch and make sure you are up to date.
git fetch # this may be necessary (depending on your git config) to receive updates on origin/master
git pull
git merge feature_branch # Merge the feature branch into the master branch.
git reset origin/master # Reset the master branch to origin's state. Git now considers all changes as unstaged changes. We can add these changes as one commit. Adding, will also add untracked files.
git add --all
git commit
One of my first questions starting programming in Visual Studio WPF was how to run processes without freezing the GUI.
After learning the basic concepts of backgroundworkers and tasks in c sharp programming I wanted to know how to report task progress while the task was not yet finished.
I found all kind of solutions to update a progress bar. I also found solutions to use the result for a specific task.
To implement this logic in a solution I started with a form on which I added a button and a listbox.
The button got the following implementation:
private async void ButtonAsyncFileProcessing_Click(object sender, RoutedEventArgs e)
{
var progressIndicator = new Progress<MyTaskProgress>(ReportProgress);
await MyMethodAsync(progressIndicator);
}
For the progress indicator I added the following class:
public class MyTaskProgress
{
//current progress
public int CurrentProgressAmount { get; set; }
//total progress
public int TotalProgressAmount { get; set; }
//some message to pass to the UI of current progress
public List<string> CurrentProgressLogging { get; set; }
}
The async method I used for testing was this:
async Task MyMethodAsync(IProgress<MyTaskProgress> progress){ int sleepTime = 1000; int totalAmount = 10000; List<string> log = new List<string>(); for (int i = 0; i <= totalAmount;){await Task.Delay(sleepTime); log.Add(string.Format("On {0} Message", i)); progress.Report(new MyTaskProgress{CurrentProgressAmount = i, TotalProgressAmount = totalAmount, CurrentProgressLogging = log });i = i + sleepTime; }}
The ReportProgress method used in the button click progressIndicator:
private void ReportProgress(MyTaskProgress progress) { UpdateScreen(progress.CurrentProgressLogging, string.Format("{0} out of {1}", progress.CurrentProgressAmount, progress.TotalProgressAmount)); }
I was developing a Windows service. Everything went smooth until I was asked to add logging for the service into a separate log file in the event viewer. I want to share my journey with you so it may help finding a solution for similar or the same issue.
After I had learned to install a service using a service installer, I ran into some troubles configuring the event viewer. My service had three logging options. First is to a text file on disk, second is to the Windows Event Viewer and I added an extra option to send a message to a messaging app. All service issues where logging fine. As a last option I was asked to log to a separate log in the event viewer like this:
First I tried adding all kind of options to my logging library to check, add and change the logging destination. That didn’t work and I found that the log needed to be set during initial installation of the service. Reason that previous attempts failed was that when changing these settings, the application needs admin privileges and changing logging options afterwards needed the machine to be rebooted etc.
The post of Simon Mattes in this article helped me out. I altered the code a bit for my own use:
public ProjectInstaller() { InitializeComponent(); //Skip through all ServiceInstallers. foreach (ServiceInstaller ThisInstaller in Installers.OfType()) { //Find the first default EventLogInstaller. EventLogInstaller ThisLogInstaller = ThisInstaller.Installers.OfType().FirstOrDefault(); if (ThisLogInstaller != null) { //Modify the used log from "Application" to the same name as the source name. //This creates a source in the "Applications and Services log" which separates your service logs from the default application log. ThisLogInstaller.Log = "TestApplication"; //ThisLogInstaller.Log = ThisLogInstaller.Source; ThisLogInstaller.Source = "TestSource"; } } }
In this article I want to describe an easy way to add an easy installer to a Windows Service project.
Steps are: – Add the installer for the service – Configure the service parameters – Add parameters to start up of the program
Add the installer for the service can be done when you open the service.cs. This will show a gray screen with two links:
Right click this screen and select Add installer in the pop up menu. This will add a ProjectInstaller.cs file with a ProjectInstaller class inside.
Open the Projectinstaller file. This will show two components.
Change settings for the two components according to your needs.
Last step is to add the installer to the program start up. For this we need to change the Program.cs.
static class Program
{
/// <summary>
/// The main entry point for the application.
/// </summary>
static void Main(string[] args)
{
if (args.Length > 0)
{
//Install service
if (args[0].Trim().ToLower() == "/i")
{
System.Configuration.Install.ManagedInstallerClass.InstallHelper(
new string[] { "/i", Assembly.GetExecutingAssembly().Location });
}
//Uninstall service
else if (args[0].Trim().ToLower() == "/u")
{
System.Configuration.Install.ManagedInstallerClass.InstallHelper(
new string[] { "/u", Assembly.GetExecutingAssembly().Location });
}
}
else
{
ServiceBase[] ServicesToRun;
ServicesToRun = new ServiceBase[]
{
new ServiceMonitor()
};
ServiceBase.Run(ServicesToRun);
}
}
}
While a workgroup computer is connected to the internet, it might not be able to reach the time servers configured. The error: “An error occurred while Windows was synchronizing with time.windows.com. The peer is unreachable.” is displayed.An error occurred while Windows was synchronizing with time.windows.com. The peer is unreachable.
I’ve found a method to add your local time server to these entries and sync time with a local time server.
Please note: Availability of certain settings can be disabled via distributed Computer policies. These policies are managed by the Computer / Domain administrator.
First you have to start the registry editor with the command regedit.
Navigate to the container: “HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers”. In this container add a new entry right clicking in the window. Add a new entry with the next number as name.
Double click the entry and add the IP address of the local time server.
Next go to the control panel and navigate to Internet Time Settings via: “Time & Language”, then “Additional date, time, & regional settings” in bottom part “Related settings”. Open “Date and Time” and then select the third tab named “Internet Time” and click the button “Change settings…”.
Select your local time server and press “Update now”.
Next add a line / lines Debugger.Break(); in your code where you want the debugger to start. Now compile in debug mode clicking in Visual Studio menu: Build, Build Solution while the Configuration Manager is set to Debug.
After the application compiled successfully we can stop and start the service to ensure these modifications are run:
Right click the Visual Studio application and select more…, Run as administrator
Click Debug, Attach to Process in the Visual Studio menu.
This will open a dialog where you need to select the right process to debug. Check the Show processes from all users checkbox. Find your Service process and click Attach.
After you have written your Windows Service in Visual Studio you might want to run this to test and use the service.
You can run your service with a few simple steps: I used a service called ServiceName in the following examples.
First start a command prompt: cmd (as admin)
Install a service is done using sc create, syntax: sc create ServiceName binPath=”pathto.exe”. If the command was successfull it will report SUCCESS. Example:
Install a service is done using sc create, syntax:
sc create ServiceName binPath=”pathto.exe”.
If the command was successfull it will report SUCCESS. Example:
I needed to
create a network share on Windows server machine which would require no
authentication whatsoever from users. This post is intended to serve me as a
reminder, since googling the solution every time eats easily away hours.
Settings
which need to be changed of course depend on version of Windows of network
share host. This post describes how to do it on a Windows 2012 R2.
Roughly what needs to be done is:
network
share should be created
share permissions
need to be set
security
settings need to be changed
In more detail:
Share a
folder by opening folder properties, navigating to Sharing tab and clicking
Advanced Sharing…
Enable sharing and click Permissions
Add Everyone (should already be there), Guest and ANONYMOUS LOGON and give them Read access
Open Group
Policy Editor (hit Ctrl+R, type gpedit.msc and hit enter)
Navigate to Computer Configuration → Windows Settings → Security Settings → Local Policies → Security Options
Change
following:
Accounts:
Guest account status – change to Enabled
Network
access: Let Everyone permissions apply to anonymous users – change to Enabled
Network
access: Restrict anonymous access to Named Pipes and Shares – change to
Disabled
Network
access: Shares that can be accessed anonymously – enter name of share you
created in the text field
————
Then after this I still had no access. After further investigation I made the following 2 additional changes:
1 I removed “guest” account from “Deny access to this computer from the network”
2 I removed a cached password on the client computer in “control userpasswords2”
Nearly every VCS has some form of branching support. Branching means you
diverge from the main line of development and continue to do work without
messing with that main line. In many VCS tools, this is a somewhat expensive
process, often requiring you to create a new copy of your source code
directory, which can take a long time for large projects.
Some people refer to Git’s branching model as its “killer feature,” and it
certainly sets Git apart in the VCS community. Why is it so special? The way
Git branches is incredibly lightweight, making branching operations nearly
instantaneous, and switching back and forth between branches generally just as
fast. Unlike many other VCSs, Git encourages workflows that branch and merge
often, even multiple times in a day. Understanding and mastering this feature
gives you a powerful and unique tool and can entirely change the way that you
develop.
Branches in a Nutshell
To really understand the way Git does branching, we need to take a step
back and examine how Git stores its data.
As you may remember from Getting Started, Git doesn’t store data as a series of changesets or differences, but instead as a series of snapshots.
When you make a commit, Git stores a commit object that contains a pointer
to the snapshot of the content you staged. This object also contains the
author’s name and email address, the message that you typed, and pointers to
the commit or commits that directly came before this commit (its parent or
parents): zero parents for the initial commit, one parent for a normal commit,
and multiple parents for a commit that results from a merge of two or more
branches.
To visualize this, let’s assume that you have a directory containing three files, and you stage them all and commit. Staging the files computes a checksum for each one (the SHA-1 hash we mentioned in Getting Started), stores that version of the file in the Git repository (Git refers to them as blobs), and adds that checksum to the staging area:
$ git add
README test.rb LICENSE
$ git commit -m
‘The initial commit of my project’
When you create the commit by running git commit, Git checksums
each subdirectory (in this case, just the root project directory) and stores
those tree objects in the Git repository. Git then creates a commit object that
has the metadata and a pointer to the root project tree so it can re-create
that snapshot when needed.
Your Git repository now contains five objects: three blobs (each
representing the contents of one of the three files), one tree that
lists the contents of the directory and specifies which file names are stored
as which blobs, and one commit with the pointer to that root tree and
all the commit metadata.
Figure 9. A commit and its tree
If you make some changes and commit again, the next commit stores a pointer
to the commit that came immediately before it.
Figure 10. Commits and their parents
A branch in Git is simply a lightweight movable pointer to one of these
commits. The default branch name in Git is master. As you start
making commits, you’re given a master branch that points to the last
commit you made. Every time you commit, the master branch pointer
moves forward automatically.
Note
The “master” branch in Git is not a special
branch. It is exactly like any other branch. The only reason nearly every
repository has one is that the git init command creates it by default and most people don’t bother to change it.
Figure 11. A branch and its commit history
Creating a New Branch
What happens when you create a new branch? Well, doing so creates a new
pointer for you to move around. Let’s say you want to create a new branch
called testing. You do this with the git branch command:
$ git branch
testing
This creates a new pointer to the same commit you’re currently on.
Figure 12. Two branches pointing into the same series of commits
How does Git know what branch you’re currently on? It keeps a special
pointer called HEAD. Note that this is a lot different than the concept of HEAD in other VCSs
you may be used to, such as Subversion or CVS. In Git, this is a pointer to the
local branch you’re currently on. In this case, you’re still on master. The git branch command only created
a new branch — it didn’t switch to that branch.
Figure 13. HEAD pointing to a branch
You can easily see this by running a simple git log command that
shows you where the branch pointers are pointing. This option is called –decorate.
$ git log
–oneline –decorate
f30ab (HEAD
-> master, testing) add feature #32 – ability to add new formats to the
central interface
34ac2 Fixed bug
#1328 – stack overflow under certain conditions
98ca9 The
initial commit of my project
You can see the “master” and “testing” branches that are right there next
to the f30ab commit.
Switching Branches
To switch to an existing branch, you run the git checkout command. Let’s
switch to the new testing branch:
$ git checkout
testing
This moves HEAD to point to the testing branch.
Figure 14. HEAD points to the current branch
What is the significance of that? Well, let’s do another commit:
$ vim test.rb
$ git commit -a
-m ‘made a change’
Figure 15. The HEAD branch moves forward when a commit is made
This is interesting, because now your testing branch has
moved forward, but your master branch still points to the
commit you were on when you ran git checkout to switch branches. Let’s switch
back to the master branch:
$ git checkout
master
Figure 16. HEAD moves when you checkout
That command did two things. It moved the HEAD pointer back to point to the
master branch, and it reverted the files in your working directory back to the
snapshot that master points to. This also means the changes you make from this point forward
will diverge from an older version of the project. It essentially rewinds the
work you’ve done in your testing branch so you can go in a
different direction.
Note
Switching branches changes files in your working directory
It’s important to note that when you switch
branches in Git, files in your working directory will change. If you switch
to an older branch, your working directory will be reverted to look like it
did the last time you committed on that branch. If Git cannot do it cleanly,
it will not let you switch at all.
Let’s make a few changes and commit again:
$ vim test.rb
$ git commit -a
-m ‘made other changes’
Now your project history has diverged (see Divergent history). You created and switched to a branch, did some work on it, and then switched back to your main branch and did other work. Both of those changes are isolated in separate branches: you can switch back and forth between the branches and merge them together when you’re ready. And you did all that with simple branch, checkout, and commit commands.
Figure 17. Divergent history
You can also see this easily with the git log command. If
you run git log –oneline –decorate –graph –all it will print
out the history of your commits, showing where your branch pointers are and how
your history has diverged.
$ git log
–oneline –decorate –graph –all
* c2b9e (HEAD,
master) made other changes
| * 87ab2
(testing) made a change
|/
* f30ab add
feature #32 – ability to add new formats to the
* 34ac2 fixed
bug #1328 – stack overflow under certain conditions
* 98ca9 initial
commit of my project
Because a branch in Git is actually a simple file that contains the 40
character SHA-1 checksum of the commit it points to, branches are cheap to
create and destroy. Creating a new branch is as quick and simple as writing 41
bytes to a file (40 characters and a newline).
This is in sharp contrast to the way most older VCS tools branch, which
involves copying all of the project’s files into a second directory. This can
take several seconds or even minutes, depending on the size of the project,
whereas in Git the process is always instantaneous. Also, because we’re
recording the parents when we commit, finding a proper merge base for merging
is automatically done for us and is generally very easy to do. These features
help encourage developers to create and use branches often.
R
In Visual Studio it is really simple to add unit tests that are automatically run in your build script. Right click your solution to add a test project:
/// <summary> /// Test if flipcoins throws as many times as requested /// </summary> [TestMethod()] public void FlipCoinsTest1Times() { //Arrange int odd, even; int times = 1;
//Act CoinFlipper coinFlipper = new CoinFlipper(); coinFlipper.FlipCoins(times, out odd, out even); //Assert Assert.IsTrue(times == odd + even); }
Open Test explorer window
Right click a selection of tests and select “Run selected tests”.
When the tests are OK, we can check in the solution. Default the Build in Azure will run libraries with names containing *test*.
The results for this solution: 8 tests passed.
We use cookies on our website to give you the most relevant experience by remembering your preferences and repeat visits. By clicking “Accept All”, you consent to the use of ALL the cookies. However, you may visit "Cookie Settings" to provide a controlled consent.
This website uses cookies to improve your experience while you navigate through the website. Out of these, the cookies that are categorized as necessary are stored on your browser as they are essential for the working of basic functionalities of the website. We also use third-party cookies that help us analyze and understand how you use this website. These cookies will be stored in your browser only with your consent. You also have the option to opt-out of these cookies. But opting out of some of these cookies may affect your browsing experience.
Necessary cookies are absolutely essential for the website to function properly. These cookies ensure basic functionalities and security features of the website, anonymously.
Cookie
Duration
Description
cookielawinfo-checkbox-analytics
11 months
This cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Analytics".
cookielawinfo-checkbox-functional
11 months
The cookie is set by GDPR cookie consent to record the user consent for the cookies in the category "Functional".
cookielawinfo-checkbox-necessary
11 months
This cookie is set by GDPR Cookie Consent plugin. The cookies is used to store the user consent for the cookies in the category "Necessary".
cookielawinfo-checkbox-others
11 months
This cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Other.
cookielawinfo-checkbox-performance
11 months
This cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Performance".
viewed_cookie_policy
11 months
The cookie is set by the GDPR Cookie Consent plugin and is used to store whether or not user has consented to the use of cookies. It does not store any personal data.
Functional cookies help to perform certain functionalities like sharing the content of the website on social media platforms, collect feedbacks, and other third-party features.
Performance cookies are used to understand and analyze the key performance indexes of the website which helps in delivering a better user experience for the visitors.
Analytical cookies are used to understand how visitors interact with the website. These cookies help provide information on metrics the number of visitors, bounce rate, traffic source, etc.
Advertisement cookies are used to provide visitors with relevant ads and marketing campaigns. These cookies track visitors across websites and collect information to provide customized ads.
