Skip to content

Commit 2e5beb5

Browse files
lbusselllbussell
authored
Merge branch 'main' into agents-md
2 parents 5445383 + b4098d6 commit 2e5beb5

File tree

20 files changed

+45
-29
lines changed

20 files changed

+45
-29
lines changed

‎eng/dockerfile-templates/aspnet/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN dism /Online /Quiet /Enable-Feature /All /FeatureName:IIS-WebServerRole {{if
1515
{{if PRODUCT_VERSION != "3.5"
1616
:
1717
# Install 2.9.0 Roslyn compilers
18-
RUN curl -fSLo microsoft.net.compilers.2.9.0.zip https://api.nuget.org/packages/microsoft.net.compilers.2.9.0.nupkg `
18+
RUN curl -fSLo microsoft.net.compilers.2.9.0.zip {{VARIABLES["roslyn|2.9.0|url"]}} `
1919
&& mkdir C:\RoslynCompilers `
2020
&& tar -C C:\RoslynCompilers -zxf microsoft.net.compilers.2.9.0.zip `
2121
&& del microsoft.net.compilers.2.9.0.zip `
@@ -24,7 +24,7 @@ RUN curl -fSLo microsoft.net.compilers.2.9.0.zip https://api.nuget.org/packages/
2424
&& %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install C:\RoslynCompilers\tools\VBCSCompiler.exe /ExeConfig:C:\RoslynCompilers\tools\VBCSCompiler.exe
2525

2626
# Install 3.6.0 Roslyn compilers
27-
RUN curl -fSLo microsoft.net.compilers.3.6.0.zip https://api.nuget.org/packages/microsoft.net.compilers.3.6.0.nupkg `
27+
RUN curl -fSLo microsoft.net.compilers.3.6.0.zip {{VARIABLES["roslyn|3.6.0|url"]}} `
2828
&& mkdir C:\RoslynCompilers-3.6.0 `
2929
&& tar -C C:\RoslynCompilers-3.6.0 -zxf microsoft.net.compilers.3.6.0.zip `
3030
&& del microsoft.net.compilers.3.6.0.zip `

‎eng/dockerfile-templates/aspnet/Dockerfile.pre20H2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN Add-WindowsFeature Web-Server; `
1717

1818
# Install 2.9.0 Roslyn compilers
1919
RUN {{if OS_VERSION_NUMBER = "ltsc2016":[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
20-
}}Invoke-WebRequest https://api.nuget.org/packages/microsoft.net.compilers.2.9.0.nupkg -OutFile C:\microsoft.net.compilers.2.9.0.zip; `
20+
}}Invoke-WebRequest {{VARIABLES["roslyn|2.9.0|url"]}} -OutFile C:\microsoft.net.compilers.2.9.0.zip; `
2121
Expand-Archive -Path C:\microsoft.net.compilers.2.9.0.zip -DestinationPath C:\RoslynCompilers; `
2222
Remove-Item C:\microsoft.net.compilers.2.9.0.zip -Force; `
2323
&$Env:windir\Microsoft.NET\Framework64\v4.0.30319\ngen install C:\RoslynCompilers\tools\csc.exe /ExeConfig:C:\RoslynCompilers\tools\csc.exe | `
@@ -29,7 +29,7 @@ RUN {{if OS_VERSION_NUMBER = "ltsc2016":[Net.ServicePointManager]::SecurityProto
2929

3030
# Install 3.6.0 Roslyn compilers
3131
RUN {{if OS_VERSION_NUMBER = "ltsc2016":[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
32-
}}Invoke-WebRequest https://api.nuget.org/packages/microsoft.net.compilers.3.6.0.nupkg -OutFile C:\microsoft.net.compilers.3.6.0.zip; `
32+
}}Invoke-WebRequest {{VARIABLES["roslyn|3.6.0|url"]}} -OutFile C:\microsoft.net.compilers.3.6.0.zip; `
3333
Expand-Archive -Path C:\microsoft.net.compilers.3.6.0.zip -DestinationPath C:\RoslynCompilers-3.6.0; `
3434
Remove-Item C:\microsoft.net.compilers.3.6.0.zip -Force; `
3535
&$Env:windir\Microsoft.NET\Framework64\v4.0.30319\ngen install C:\RoslynCompilers-3.6.0\tools\csc.exe /ExeConfig:C:\RoslynCompilers-3.6.0\tools\csc.exe | `

‎eng/dockerfile-templates/sdk/Dockerfile.install-reference-assemblies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN powershell -Command "`
1414
foreach ($version in @@({{join(versions, ", ")}})) { `
1515
# Download reference assembly NuGet package `
1616
$package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; `
17-
nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version {{packageVersion}} -OutputDirectory ${Env:TEMP}\Packages; `
17+
nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version {{packageVersion}} -OutputDirectory ${Env:TEMP}\Packages -Source {{VARIABLES["dotnet-public|source"]}}; `
1818
$contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; `
1919
# Remove IntelliSense files `
2020
Get-ChildItem -File -Recurse -Path \"${contents}\" | `

‎eng/pipelines/dotnet-framework-samples.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ extends:
3939
parameters:
4040
reposToExcludeFromScanning:
4141
- VersionsRepo
42-
# Use "Permissive" network policy because .NET Framework image builds
43-
# reach out to nuget.org. Remove this parameter when the following issue is
44-
# resolved: https://github.com/microsoft/dotnet-framework-docker/issues/1286
45-
networkIsolationPolicy: Permissive
4642
stages:
4743
- template: /eng/docker-tools/templates/stages/dotnet/publish-config-${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'prod', 'nonprod') }}.yml@self
4844
parameters:

‎eng/pipelines/dotnet-framework.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ extends:
3939
parameters:
4040
reposToExcludeFromScanning:
4141
- VersionsRepo
42-
# Use "Permissive" network policy because .NET Framework image builds
43-
# reach out to nuget.org. Remove this parameter when the following issue is
44-
# resolved: https://github.com/microsoft/dotnet-framework-docker/issues/1286
45-
networkIsolationPolicy: Permissive
4642
stages:
4743
- template: /eng/docker-tools/templates/stages/dotnet/publish-config-${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'prod', 'nonprod') }}.yml@self
4844
parameters:

‎manifest.versions.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
"vs|ltsc2016|testAgentUrl": "https://aka.ms/vs/17/release/vs_TestAgent.exe",
2020
"vs|ltsc2016|buildToolsUrl": "https://aka.ms/vs/17/release/vs_BuildTools.exe",
2121
"4.8|url": "https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/ndp48-x86-x64-allos-enu.exe",
22-
"4.8.1|url": "https://download.visualstudio.microsoft.com/download/pr/6f083c7e-bd40-44d4-9e3f-ffba71ec8b09/3951fd5af6098f2c7e8ff5c331a0679c/ndp481-x86-x64-allos-enu.exe"
22+
"4.8.1|url": "https://download.visualstudio.microsoft.com/download/pr/6f083c7e-bd40-44d4-9e3f-ffba71ec8b09/3951fd5af6098f2c7e8ff5c331a0679c/ndp481-x86-x64-allos-enu.exe",
23+
"dotnet-public|source": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
24+
"roslyn|2.9.0|url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/flat2/microsoft.net.compilers/2.9.0/microsoft.net.compilers.2.9.0.nupkg",
25+
"roslyn|3.6.0|url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/flat2/microsoft.net.compilers/3.6.0/microsoft.net.compilers.3.6.0.nupkg"
2326
}
2427
}

‎samples/aspnetapp/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build
22
WORKDIR /app
33

44
# copy csproj and restore as distinct layers
5-
COPY *.sln .
5+
COPY *.sln NuGet.config ./
66
COPY aspnetapp/*.csproj ./aspnetapp/
77
COPY aspnetapp/*.config ./aspnetapp/
88
RUN nuget restore

‎samples/aspnetapp/NuGet.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
6+
</packageSources>
7+
</configuration>

‎samples/aspnetmvcapp/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build
22
WORKDIR /app
33

44
# copy csproj and restore as distinct layers
5-
COPY *.sln .
5+
COPY *.sln NuGet.config ./
66
COPY aspnetmvcapp/*.csproj ./aspnetmvcapp/
77
COPY aspnetmvcapp/*.config ./aspnetmvcapp/
88
RUN nuget restore

‎samples/aspnetmvcapp/NuGet.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
6+
</packageSources>
7+
</configuration>

0 commit comments

Comments
 (0)