Skip to content

Commit 0bf41a9

Browse files
vmapetrvmapetr
committed
Merge remote-tracking branch 'origin/master' into Localization
2 parents 41d0ce3 + 842df8d commit 0bf41a9

File tree

10 files changed

+13
-36
lines changed

10 files changed

+13
-36
lines changed

‎src/Agent.Listener/Agent.Listener.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="2.0.5" />
2626
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
2727
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
28+
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
2829
</ItemGroup>
2930

3031
<ItemGroup>

‎src/Agent.PluginHost/Agent.PluginHost.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="2.0.5" />
1818
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
1919
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
20+
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
2021
</ItemGroup>
2122
</Project>

‎src/Agent.Plugins/Agent.Plugins.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="2.0.5" />
2020
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
2121
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
22+
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
2223
</ItemGroup>
2324
</Project>

‎src/Agent.Sdk/Agent.Sdk.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
<PackageReference Include="vss-api-netcore" Version="$(VssApiVersion)" />
1919
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
2020
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
21+
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
2122
</ItemGroup>
2223
</Project>

‎src/Agent.Sdk/Knob/AgentKnobs.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -652,13 +652,6 @@ public class AgentKnobs
652652
new RuntimeKnobSource("AZP_AGENT_CHECK_IF_TASK_NODE_RUNNER_IS_DEPRECATED"),
653653
new BuiltInDefaultKnobSource("false"));
654654

655-
public static readonly Knob MountWorkspace = new Knob(
656-
nameof(MountWorkspace),
657-
"If true, the agent will mount the Pipeline.Workspace directory instead of the Working directory for steps which target a Docker container.",
658-
new RuntimeKnobSource("AZP_AGENT_MOUNT_WORKSPACE"),
659-
new EnvironmentKnobSource("AZP_AGENT_MOUNT_WORKSPACE"),
660-
new BuiltInDefaultKnobSource("false"));
661-
662655
public static readonly Knob EnableNewSecretMasker = new Knob(
663656
nameof(EnableNewSecretMasker),
664657
"If true, the agent will use new SecretMasker with additional filters & performance enhancements",

‎src/Agent.Worker/Agent.Worker.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="2.0.5" />
2121
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
2222
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
23+
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
2324
</ItemGroup>
2425
</Project>

‎src/Agent.Worker/ContainerOperationProvider.cs

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -483,34 +483,12 @@ private async Task StartContainerAsync(IExecutionContext executionContext, Conta
483483

484484
if (container.ImageOS != PlatformUtil.OS.Windows)
485485
{
486-
if (AgentKnobs.MountWorkspace.GetValue(executionContext).AsBoolean())
487-
{
488-
string workspace = executionContext.Variables.Get(Constants.Variables.Pipeline.Workspace);
489-
workspace = container.TranslateContainerPathForImageOS(PlatformUtil.HostOS, container.TranslateToContainerPath(workspace));
490-
string mountWorkspace = container.TranslateToHostPath(workspace);
491-
executionContext.Debug($"Workspace {workspace}");
492-
executionContext.Debug($"Mount Workspace {mountWorkspace}");
493-
container.MountVolumes.Add(new MountVolume(mountWorkspace, workspace, readOnly: container.isReadOnlyVolume(Constants.DefaultContainerMounts.Work)));
494-
}
495-
else
496-
{
497-
string defaultWorkingDirectory = executionContext.Variables.Get(Constants.Variables.System.DefaultWorkingDirectory);
498-
defaultWorkingDirectory = container.TranslateContainerPathForImageOS(PlatformUtil.HostOS, container.TranslateToContainerPath(defaultWorkingDirectory));
499-
if (string.IsNullOrEmpty(defaultWorkingDirectory))
500-
{
501-
throw new NotSupportedException(StringUtil.Loc("ContainerJobRequireSystemDefaultWorkDir"));
502-
}
503-
504-
string workingDirectory = IOUtil.GetDirectoryName(defaultWorkingDirectory.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), container.ImageOS);
505-
string mountWorkingDirectory = container.TranslateToHostPath(workingDirectory);
506-
executionContext.Debug($"Default Working Directory {defaultWorkingDirectory}");
507-
executionContext.Debug($"Working Directory {workingDirectory}");
508-
executionContext.Debug($"Mount Working Directory {mountWorkingDirectory}");
509-
if (!string.IsNullOrEmpty(workingDirectory))
510-
{
511-
container.MountVolumes.Add(new MountVolume(mountWorkingDirectory, workingDirectory, readOnly: container.isReadOnlyVolume(Constants.DefaultContainerMounts.Work)));
512-
}
513-
}
486+
string workspace = executionContext.Variables.Get(Constants.Variables.Pipeline.Workspace);
487+
workspace = container.TranslateContainerPathForImageOS(PlatformUtil.HostOS, container.TranslateToContainerPath(workspace));
488+
string mountWorkspace = container.TranslateToHostPath(workspace);
489+
executionContext.Debug($"Workspace: {workspace}");
490+
executionContext.Debug($"Mount Workspace: {mountWorkspace}");
491+
container.MountVolumes.Add(new MountVolume(mountWorkspace, workspace, readOnly: container.isReadOnlyVolume(Constants.DefaultContainerMounts.Work)));
514492

515493
container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Temp), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Temp))));
516494
container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Tasks), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Tasks)),

‎src/Microsoft.VisualStudio.Services.Agent/Microsoft.VisualStudio.Services.Agent.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
2323
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="2.0.5" />
2424
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
25+
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
2526
</ItemGroup>
2627

2728
</Project>

‎src/Misc/layoutbin/en-US/strings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@
239239
"ConnectingToServer": "Connecting to server ...",
240240
"ConnectSectionHeader": "Connect",
241241
"ConnectToServer": "Connecting to the server.",
242-
"ContainerJobRequireSystemDefaultWorkDir": "System.DefaultWorkingDirectory is required for running a container job.",
243242
"ContainerWindowsVersionRequirement": "Container feature requires Windows Server 1803 or higher. Please reference documentation (https://go.microsoft.com/fwlink/?linkid=875268)",
244243
"CopyFileComplete": "Successfully published artifacts to {0}",
245244
"CopyFileToDestination": "Copy file '{0}' to '{1}'",

‎src/Test/Test.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="2.0.5" />
3030
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
3131
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
32+
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
3233
</ItemGroup>
3334

3435
<ItemGroup>

0 commit comments

Comments
 (0)