Changing Version Control to Visual Studio : Différence entre versions

[version en cours de rédaction][version en cours de rédaction]
Ligne 47 : Ligne 47 :
 
{{Tuto Step
 
{{Tuto Step
 
|Step_Title=<translate>Create the Repository</translate>
 
|Step_Title=<translate>Create the Repository</translate>
|Step_Content=<translate># Open Team Explorer
+
|Step_Content=<translate>#Open Team Explorer
# Clone a new Git Repository
+
#Clone a new Git Repository
# URL to clone: https://bitbucket.org/StugaMachinery/tc3Multi
+
#URL to clone: https://bitbucket.org/StugaMachinery/tc3Multi
# Click on the destination setup
+
#Click on the destination setup
# Create a new folder under the machine build folder called "source"
+
#Create a new folder under the machine build folder called "source"
# Click 'Clone'</translate>
+
#Click 'Clone'</translate>
 
|Step_Picture_00=Changing_Version_Control_to_Visual_Studio_Screenshot_2022-03-18_132650.jpg
 
|Step_Picture_00=Changing_Version_Control_to_Visual_Studio_Screenshot_2022-03-18_132650.jpg
 
|Step_Picture_00_annotation={"version":"2.4.6","objects":[{"type":"image","version":"2.4.6","originX":"left","originY":"top","left":0,"top":0,"width":568,"height":337,"fill":"rgb(0,0,0)","stroke":null,"strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1.06,"scaleY":1.06,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"crossOrigin":"","cropX":0,"cropY":0,"src":"https://stuga.dokit.app/images/e/ef/Changing_Version_Control_to_Visual_Studio_Screenshot_2022-03-18_132650.jpg","filters":[]},{"type":"wfnumberedbullet","version":"2.4.6","originX":"left","originY":"top","left":85,"top":227,"width":25,"height":25,"fill":"rgb(0,0,0)","stroke":"#FF0000","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"objects":[{"type":"circle","version":"2.4.6","originX":"center","originY":"center","left":0,"top":0,"width":24,"height":24,"fill":"#FF0000","stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":12,"startAngle":0,"endAngle":6.283185307179586},{"type":"text","version":"2.4.6","originX":"center","originY":"center","left":0,"top":0,"width":7.79,"height":15.82,"fill":"rgba(255,255,255,255)","stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"text":"1","fontSize":14,"fontWeight":"normal","fontFamily":"arial","fontStyle":"normal","lineHeight":1.16,"underline":false,"overline":false,"linethrough":false,"textAlign":"left","textBackgroundColor":"","charSpacing":0,"styles":{} }],"number":1},{"type":"wfrect","version":"2.4.6","originX":"center","originY":"center","left":340.84,"top":238.4,"width":344.98,"height":32.96,"fill":"rgba(255,0,0,0)","stroke":"#FF0000","strokeWidth":2,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"rx":0,"ry":0}],"height":356,"width":600}
 
|Step_Picture_00_annotation={"version":"2.4.6","objects":[{"type":"image","version":"2.4.6","originX":"left","originY":"top","left":0,"top":0,"width":568,"height":337,"fill":"rgb(0,0,0)","stroke":null,"strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1.06,"scaleY":1.06,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"crossOrigin":"","cropX":0,"cropY":0,"src":"https://stuga.dokit.app/images/e/ef/Changing_Version_Control_to_Visual_Studio_Screenshot_2022-03-18_132650.jpg","filters":[]},{"type":"wfnumberedbullet","version":"2.4.6","originX":"left","originY":"top","left":85,"top":227,"width":25,"height":25,"fill":"rgb(0,0,0)","stroke":"#FF0000","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"objects":[{"type":"circle","version":"2.4.6","originX":"center","originY":"center","left":0,"top":0,"width":24,"height":24,"fill":"#FF0000","stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":12,"startAngle":0,"endAngle":6.283185307179586},{"type":"text","version":"2.4.6","originX":"center","originY":"center","left":0,"top":0,"width":7.79,"height":15.82,"fill":"rgba(255,255,255,255)","stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"text":"1","fontSize":14,"fontWeight":"normal","fontFamily":"arial","fontStyle":"normal","lineHeight":1.16,"underline":false,"overline":false,"linethrough":false,"textAlign":"left","textBackgroundColor":"","charSpacing":0,"styles":{} }],"number":1},{"type":"wfrect","version":"2.4.6","originX":"center","originY":"center","left":340.84,"top":238.4,"width":344.98,"height":32.96,"fill":"rgba(255,0,0,0)","stroke":"#FF0000","strokeWidth":2,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"rx":0,"ry":0}],"height":356,"width":600}
Ligne 65 : Ligne 65 :
 
}}
 
}}
 
{{Tuto Step
 
{{Tuto Step
|Step_Title=<translate>Move The PLC_Reset Project</translate>
+
|Step_Title=<translate>Enter Git Credentials (if required)</translate>
|Step_Content=<translate></translate>
+
|Step_Content=<translate>Atlassian Username is StugaMachinery
 +
 
 +
Password is stored in the file
 +
 
 +
 
 +
G:\IT Department\SourceTree BitBucket App Password.txt</translate>
 +
}}
 +
{{Tuto Step
 +
|Step_Title=<translate>Move The PLC_Reset and tc3Multi Project</translate>
 +
|Step_Content=<translate># Right click the PLC_Reset Project
 +
# Select Change Project
 +
# Navigate to the repository you have created in Step 4 c:\TwinCAT\Stuga\BuildNo\source\PLC_Reset\PLC_Reset.plcproj
 +
# Repeat for the tc3Multi project</translate>
 +
|Step_Picture_00=Changing_Version_Control_to_Visual_Studio_Screenshot_2022-03-18_163703.jpg
 +
|Step_Picture_00_annotation={"version":"2.4.6","objects":[{"type":"image","version":"2.4.6","originX":"left","originY":"top","left":0,"top":0,"width":669,"height":1120,"fill":"rgb(0,0,0)","stroke":null,"strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":0.9,"scaleY":0.9,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"crossOrigin":"","cropX":0,"cropY":0,"src":"https://stuga.dokit.app/images/1/1d/Changing_Version_Control_to_Visual_Studio_Screenshot_2022-03-18_163703.jpg","filters":[]},{"type":"wfrect","version":"2.4.6","originX":"center","originY":"center","left":259.88,"top":939.48,"width":148.91,"height":31.25,"fill":"rgba(255,0,0,0)","stroke":"#FF0000","strokeWidth":2,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"rx":0,"ry":0}],"height":1004,"width":600}
 
}}
 
}}
 
{{Tuto Step
 
{{Tuto Step

Version du 18 mars 2022 à 18:44

Auteur avatarGareth Green | Dernière modification 12/09/2022 par Gareth Green en cours de rédaction

Introduction

In March 2022 the password policy of the system behind SourceTree / Bitbucket and Atlassian changed - link. This meant all machine would need a complex password login change for the SourceTree program used for version control of the PLC code.


This was not straight-forward to resolve, so the decision was made to change the version control system to the one that is packaged with the Visual Studio system by default. This is a better method anyway, but it needs the "TcXaeShell" installed.

...The TcXaeShell is simply a newer version of Visual Studio that includes Source control, rebadged for TwinCAT3

Étape 1 - Ensure TcXAEShell is installed

  1. Right click on TwinCAT service in the task bar
  2. If TcXaeShell is installed you will see the gold Icon with the cog inside


There is a Visual Studio icon here instead, you will need to install TcXaeShell.

Procedure is here




Étape 2 - Open TwinCAT Shell



Étape 3 - Open the Machine Solution File



Étape 4 - Create the Repository

  1. Open Team Explorer
  2. Clone a new Git Repository
  3. URL to clone: https://bitbucket.org/StugaMachinery/tc3Multi
  4. Click on the destination setup
  5. Create a new folder under the machine build folder called "source"
  6. Click 'Clone'

Étape 5 - Enter Git Credentials (if required)

Atlassian Username is StugaMachinery

Password is stored in the file


G:\IT Department\SourceTree BitBucket App Password.txt

Étape 6 - Move The PLC_Reset and tc3Multi Project

  1. Right click the PLC_Reset Project
  2. Select Change Project
  3. Navigate to the repository you have created in Step 4 c:\TwinCAT\Stuga\BuildNo\source\PLC_Reset\PLC_Reset.plcproj
  4. Repeat for the tc3Multi project



Étape 7 - Delete the versionControl Folder

Delete the versionControl folder completely

...This prevents confusion in the future of where the project exists



Étape 8 - Update Control Systems Log

Update the Version Control column on the board to "VisualStudio" to log the completion of this task



Commentaires

Draft