diff --git a/eng/dockerfile-templates/aspnet/Dockerfile b/eng/dockerfile-templates/aspnet/Dockerfile index e23c75a5..7c0a60a5 100644 --- a/eng/dockerfile-templates/aspnet/Dockerfile +++ b/eng/dockerfile-templates/aspnet/Dockerfile @@ -15,7 +15,7 @@ RUN dism /Online /Quiet /Enable-Feature /All /FeatureName:IIS-WebServerRole {{if {{if PRODUCT_VERSION != "3.5" : # Install 2.9.0 Roslyn compilers -RUN curl -fSLo microsoft.net.compilers.2.9.0.zip https://api.nuget.org/packages/microsoft.net.compilers.2.9.0.nupkg ` +RUN curl -fSLo microsoft.net.compilers.2.9.0.zip {{VARIABLES["roslyn|2.9.0|url"]}} ` && mkdir C:\RoslynCompilers ` && tar -C C:\RoslynCompilers -zxf microsoft.net.compilers.2.9.0.zip ` && 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/ && %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install C:\RoslynCompilers\tools\VBCSCompiler.exe /ExeConfig:C:\RoslynCompilers\tools\VBCSCompiler.exe # Install 3.6.0 Roslyn compilers -RUN curl -fSLo microsoft.net.compilers.3.6.0.zip https://api.nuget.org/packages/microsoft.net.compilers.3.6.0.nupkg ` +RUN curl -fSLo microsoft.net.compilers.3.6.0.zip {{VARIABLES["roslyn|3.6.0|url"]}} ` && mkdir C:\RoslynCompilers-3.6.0 ` && tar -C C:\RoslynCompilers-3.6.0 -zxf microsoft.net.compilers.3.6.0.zip ` && del microsoft.net.compilers.3.6.0.zip ` diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.pre20H2 b/eng/dockerfile-templates/aspnet/Dockerfile.pre20H2 index 4ec38d9a..29433f0f 100644 --- a/eng/dockerfile-templates/aspnet/Dockerfile.pre20H2 +++ b/eng/dockerfile-templates/aspnet/Dockerfile.pre20H2 @@ -17,7 +17,7 @@ RUN Add-WindowsFeature Web-Server; ` # Install 2.9.0 Roslyn compilers RUN {{if OS_VERSION_NUMBER = "ltsc2016":[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - }}Invoke-WebRequest https://api.nuget.org/packages/microsoft.net.compilers.2.9.0.nupkg -OutFile C:\microsoft.net.compilers.2.9.0.zip; ` + }}Invoke-WebRequest {{VARIABLES["roslyn|2.9.0|url"]}} -OutFile C:\microsoft.net.compilers.2.9.0.zip; ` Expand-Archive -Path C:\microsoft.net.compilers.2.9.0.zip -DestinationPath C:\RoslynCompilers; ` Remove-Item C:\microsoft.net.compilers.2.9.0.zip -Force; ` &$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 # Install 3.6.0 Roslyn compilers RUN {{if OS_VERSION_NUMBER = "ltsc2016":[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - }}Invoke-WebRequest https://api.nuget.org/packages/microsoft.net.compilers.3.6.0.nupkg -OutFile C:\microsoft.net.compilers.3.6.0.zip; ` + }}Invoke-WebRequest {{VARIABLES["roslyn|3.6.0|url"]}} -OutFile C:\microsoft.net.compilers.3.6.0.zip; ` Expand-Archive -Path C:\microsoft.net.compilers.3.6.0.zip -DestinationPath C:\RoslynCompilers-3.6.0; ` Remove-Item C:\microsoft.net.compilers.3.6.0.zip -Force; ` &$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 | ` diff --git a/eng/dockerfile-templates/sdk/Dockerfile.install-reference-assemblies b/eng/dockerfile-templates/sdk/Dockerfile.install-reference-assemblies index 99b67ca9..a7930a5e 100644 --- a/eng/dockerfile-templates/sdk/Dockerfile.install-reference-assemblies +++ b/eng/dockerfile-templates/sdk/Dockerfile.install-reference-assemblies @@ -14,7 +14,7 @@ RUN powershell -Command "` foreach ($version in @@({{join(versions, ", ")}})) { ` # Download reference assembly NuGet package ` $package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; ` - nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version {{packageVersion}} -OutputDirectory ${Env:TEMP}\Packages; ` + nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version {{packageVersion}} -OutputDirectory ${Env:TEMP}\Packages -Source {{VARIABLES["dotnet-public|source"]}}; ` $contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; ` # Remove IntelliSense files ` Get-ChildItem -File -Recurse -Path \"${contents}\" | ` diff --git a/eng/pipelines/dotnet-framework-samples.yml b/eng/pipelines/dotnet-framework-samples.yml index 63a2b0ed..d747611d 100644 --- a/eng/pipelines/dotnet-framework-samples.yml +++ b/eng/pipelines/dotnet-framework-samples.yml @@ -39,10 +39,6 @@ extends: parameters: reposToExcludeFromScanning: - VersionsRepo - # Use "Permissive" network policy because .NET Framework image builds - # reach out to nuget.org. Remove this parameter when the following issue is - # resolved: https://github.com/microsoft/dotnet-framework-docker/issues/1286 - networkIsolationPolicy: Permissive stages: - template: /eng/docker-tools/templates/stages/dotnet/publish-config-${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'prod', 'nonprod') }}.yml@self parameters: diff --git a/eng/pipelines/dotnet-framework.yml b/eng/pipelines/dotnet-framework.yml index b7f0eaad..372931ea 100644 --- a/eng/pipelines/dotnet-framework.yml +++ b/eng/pipelines/dotnet-framework.yml @@ -39,10 +39,6 @@ extends: parameters: reposToExcludeFromScanning: - VersionsRepo - # Use "Permissive" network policy because .NET Framework image builds - # reach out to nuget.org. Remove this parameter when the following issue is - # resolved: https://github.com/microsoft/dotnet-framework-docker/issues/1286 - networkIsolationPolicy: Permissive stages: - template: /eng/docker-tools/templates/stages/dotnet/publish-config-${{ iif(contains(variables['Build.DefinitionName'], '-official'), 'prod', 'nonprod') }}.yml@self parameters: diff --git a/manifest.versions.json b/manifest.versions.json index c4a992a3..374ccb4b 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -19,6 +19,9 @@ "vs|ltsc2016|testAgentUrl": "https://aka.ms/vs/17/release/vs_TestAgent.exe", "vs|ltsc2016|buildToolsUrl": "https://aka.ms/vs/17/release/vs_BuildTools.exe", "4.8|url": "https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/ndp48-x86-x64-allos-enu.exe", - "4.8.1|url": "https://download.visualstudio.microsoft.com/download/pr/6f083c7e-bd40-44d4-9e3f-ffba71ec8b09/3951fd5af6098f2c7e8ff5c331a0679c/ndp481-x86-x64-allos-enu.exe" + "4.8.1|url": "https://download.visualstudio.microsoft.com/download/pr/6f083c7e-bd40-44d4-9e3f-ffba71ec8b09/3951fd5af6098f2c7e8ff5c331a0679c/ndp481-x86-x64-allos-enu.exe", + "dotnet-public|source": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", + "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", + "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" } } diff --git a/samples/aspnetapp/Dockerfile b/samples/aspnetapp/Dockerfile index 1ccf413e..09d5a1a5 100644 --- a/samples/aspnetapp/Dockerfile +++ b/samples/aspnetapp/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build WORKDIR /app # copy csproj and restore as distinct layers -COPY *.sln . +COPY *.sln NuGet.config ./ COPY aspnetapp/*.csproj ./aspnetapp/ COPY aspnetapp/*.config ./aspnetapp/ RUN nuget restore diff --git a/samples/aspnetapp/NuGet.config b/samples/aspnetapp/NuGet.config new file mode 100644 index 00000000..bff97919 --- /dev/null +++ b/samples/aspnetapp/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/samples/aspnetmvcapp/Dockerfile b/samples/aspnetmvcapp/Dockerfile index 57801b16..c955151c 100644 --- a/samples/aspnetmvcapp/Dockerfile +++ b/samples/aspnetmvcapp/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build WORKDIR /app # copy csproj and restore as distinct layers -COPY *.sln . +COPY *.sln NuGet.config ./ COPY aspnetmvcapp/*.csproj ./aspnetmvcapp/ COPY aspnetmvcapp/*.config ./aspnetmvcapp/ RUN nuget restore diff --git a/samples/aspnetmvcapp/NuGet.config b/samples/aspnetmvcapp/NuGet.config new file mode 100644 index 00000000..bff97919 --- /dev/null +++ b/samples/aspnetmvcapp/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/samples/dotnetapp/Dockerfile b/samples/dotnetapp/Dockerfile index 55872994..87352a7a 100644 --- a/samples/dotnetapp/Dockerfile +++ b/samples/dotnetapp/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build WORKDIR /app # copy csproj and restore as distinct layers -COPY *.csproj . +COPY NuGet.config *.csproj ./ RUN dotnet restore # copy and build everything else diff --git a/samples/dotnetapp/NuGet.config b/samples/dotnetapp/NuGet.config new file mode 100644 index 00000000..bff97919 --- /dev/null +++ b/samples/dotnetapp/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/aspnet/4.8.1/windowsservercore-ltsc2022/Dockerfile b/src/aspnet/4.8.1/windowsservercore-ltsc2022/Dockerfile index 2d915526..3ff83a13 100644 --- a/src/aspnet/4.8.1/windowsservercore-ltsc2022/Dockerfile +++ b/src/aspnet/4.8.1/windowsservercore-ltsc2022/Dockerfile @@ -12,7 +12,7 @@ RUN dism /Online /Quiet /Enable-Feature /All /FeatureName:IIS-WebServerRole /Fea && %windir%\Microsoft.NET\Framework\v4.0.30319\ngen update # Install 2.9.0 Roslyn compilers -RUN curl -fSLo microsoft.net.compilers.2.9.0.zip https://api.nuget.org/packages/microsoft.net.compilers.2.9.0.nupkg ` +RUN curl -fSLo microsoft.net.compilers.2.9.0.zip 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 ` && mkdir C:\RoslynCompilers ` && tar -C C:\RoslynCompilers -zxf microsoft.net.compilers.2.9.0.zip ` && del microsoft.net.compilers.2.9.0.zip ` @@ -21,7 +21,7 @@ RUN curl -fSLo microsoft.net.compilers.2.9.0.zip https://api.nuget.org/packages/ && %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install C:\RoslynCompilers\tools\VBCSCompiler.exe /ExeConfig:C:\RoslynCompilers\tools\VBCSCompiler.exe # Install 3.6.0 Roslyn compilers -RUN curl -fSLo microsoft.net.compilers.3.6.0.zip https://api.nuget.org/packages/microsoft.net.compilers.3.6.0.nupkg ` +RUN curl -fSLo microsoft.net.compilers.3.6.0.zip 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 ` && mkdir C:\RoslynCompilers-3.6.0 ` && tar -C C:\RoslynCompilers-3.6.0 -zxf microsoft.net.compilers.3.6.0.zip ` && del microsoft.net.compilers.3.6.0.zip ` diff --git a/src/aspnet/4.8.1/windowsservercore-ltsc2025/Dockerfile b/src/aspnet/4.8.1/windowsservercore-ltsc2025/Dockerfile index efd6da45..27d9a7fd 100644 --- a/src/aspnet/4.8.1/windowsservercore-ltsc2025/Dockerfile +++ b/src/aspnet/4.8.1/windowsservercore-ltsc2025/Dockerfile @@ -12,7 +12,7 @@ RUN dism /Online /Quiet /Enable-Feature /All /FeatureName:IIS-WebServerRole /Fea && %windir%\Microsoft.NET\Framework\v4.0.30319\ngen update # Install 2.9.0 Roslyn compilers -RUN curl -fSLo microsoft.net.compilers.2.9.0.zip https://api.nuget.org/packages/microsoft.net.compilers.2.9.0.nupkg ` +RUN curl -fSLo microsoft.net.compilers.2.9.0.zip 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 ` && mkdir C:\RoslynCompilers ` && tar -C C:\RoslynCompilers -zxf microsoft.net.compilers.2.9.0.zip ` && del microsoft.net.compilers.2.9.0.zip ` @@ -21,7 +21,7 @@ RUN curl -fSLo microsoft.net.compilers.2.9.0.zip https://api.nuget.org/packages/ && %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen install C:\RoslynCompilers\tools\VBCSCompiler.exe /ExeConfig:C:\RoslynCompilers\tools\VBCSCompiler.exe # Install 3.6.0 Roslyn compilers -RUN curl -fSLo microsoft.net.compilers.3.6.0.zip https://api.nuget.org/packages/microsoft.net.compilers.3.6.0.nupkg ` +RUN curl -fSLo microsoft.net.compilers.3.6.0.zip 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 ` && mkdir C:\RoslynCompilers-3.6.0 ` && tar -C C:\RoslynCompilers-3.6.0 -zxf microsoft.net.compilers.3.6.0.zip ` && del microsoft.net.compilers.3.6.0.zip ` diff --git a/src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile b/src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile index e9aa1668..8f3a7575 100644 --- a/src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile +++ b/src/aspnet/4.8/windowsservercore-ltsc2016/Dockerfile @@ -16,7 +16,7 @@ RUN Add-WindowsFeature Web-Server; ` # Install 2.9.0 Roslyn compilers RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - Invoke-WebRequest https://api.nuget.org/packages/microsoft.net.compilers.2.9.0.nupkg -OutFile C:\microsoft.net.compilers.2.9.0.zip; ` + Invoke-WebRequest 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 -OutFile C:\microsoft.net.compilers.2.9.0.zip; ` Expand-Archive -Path C:\microsoft.net.compilers.2.9.0.zip -DestinationPath C:\RoslynCompilers; ` Remove-Item C:\microsoft.net.compilers.2.9.0.zip -Force; ` &$Env:windir\Microsoft.NET\Framework64\v4.0.30319\ngen install C:\RoslynCompilers\tools\csc.exe /ExeConfig:C:\RoslynCompilers\tools\csc.exe | ` @@ -28,7 +28,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl # Install 3.6.0 Roslyn compilers RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` - Invoke-WebRequest https://api.nuget.org/packages/microsoft.net.compilers.3.6.0.nupkg -OutFile C:\microsoft.net.compilers.3.6.0.zip; ` + Invoke-WebRequest 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 -OutFile C:\microsoft.net.compilers.3.6.0.zip; ` Expand-Archive -Path C:\microsoft.net.compilers.3.6.0.zip -DestinationPath C:\RoslynCompilers-3.6.0; ` Remove-Item C:\microsoft.net.compilers.3.6.0.zip -Force; ` &$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 | ` diff --git a/src/aspnet/4.8/windowsservercore-ltsc2019/Dockerfile b/src/aspnet/4.8/windowsservercore-ltsc2019/Dockerfile index 95ac8e06..ae2f0439 100644 --- a/src/aspnet/4.8/windowsservercore-ltsc2019/Dockerfile +++ b/src/aspnet/4.8/windowsservercore-ltsc2019/Dockerfile @@ -14,7 +14,7 @@ RUN Add-WindowsFeature Web-Server; ` &$Env:windir\Microsoft.NET\Framework\v4.0.30319\ngen update # Install 2.9.0 Roslyn compilers -RUN Invoke-WebRequest https://api.nuget.org/packages/microsoft.net.compilers.2.9.0.nupkg -OutFile C:\microsoft.net.compilers.2.9.0.zip; ` +RUN Invoke-WebRequest 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 -OutFile C:\microsoft.net.compilers.2.9.0.zip; ` Expand-Archive -Path C:\microsoft.net.compilers.2.9.0.zip -DestinationPath C:\RoslynCompilers; ` Remove-Item C:\microsoft.net.compilers.2.9.0.zip -Force; ` &$Env:windir\Microsoft.NET\Framework64\v4.0.30319\ngen install C:\RoslynCompilers\tools\csc.exe /ExeConfig:C:\RoslynCompilers\tools\csc.exe | ` @@ -25,7 +25,7 @@ RUN Invoke-WebRequest https://api.nuget.org/packages/microsoft.net.compilers.2.9 &$Env:windir\Microsoft.NET\Framework\v4.0.30319\ngen install C:\RoslynCompilers\tools\VBCSCompiler.exe /ExeConfig:C:\RoslynCompilers\tools\VBCSCompiler.exe # Install 3.6.0 Roslyn compilers -RUN Invoke-WebRequest https://api.nuget.org/packages/microsoft.net.compilers.3.6.0.nupkg -OutFile C:\microsoft.net.compilers.3.6.0.zip; ` +RUN Invoke-WebRequest 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 -OutFile C:\microsoft.net.compilers.3.6.0.zip; ` Expand-Archive -Path C:\microsoft.net.compilers.3.6.0.zip -DestinationPath C:\RoslynCompilers-3.6.0; ` Remove-Item C:\microsoft.net.compilers.3.6.0.zip -Force; ` &$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 | ` diff --git a/src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile b/src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile index fa963f30..f1ee129e 100644 --- a/src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile +++ b/src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile @@ -67,7 +67,7 @@ RUN powershell -Command "` foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { ` # Download reference assembly NuGet package ` $package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; ` - nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; ` + nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json; ` $contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; ` # Remove IntelliSense files ` Get-ChildItem -File -Recurse -Path \"${contents}\" | ` diff --git a/src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile b/src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile index ea99b9fa..1a0bf9be 100644 --- a/src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile +++ b/src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile @@ -67,7 +67,7 @@ RUN powershell -Command "` foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { ` # Download reference assembly NuGet package ` $package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; ` - nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; ` + nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json; ` $contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; ` # Remove IntelliSense files ` Get-ChildItem -File -Recurse -Path \"${contents}\" | ` diff --git a/src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile b/src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile index 50d22565..0256721d 100644 --- a/src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile +++ b/src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile @@ -90,7 +90,7 @@ RUN powershell -Command "` foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { ` # Download reference assembly NuGet package ` $package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; ` - nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; ` + nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json; ` $contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; ` # Remove IntelliSense files ` Get-ChildItem -File -Recurse -Path \"${contents}\" | ` diff --git a/src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile b/src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile index b26724f2..2e8f5877 100644 --- a/src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile +++ b/src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile @@ -66,7 +66,7 @@ RUN powershell -Command "` foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { ` # Download reference assembly NuGet package ` $package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; ` - nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; ` + nuget install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json; ` $contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; ` # Remove IntelliSense files ` Get-ChildItem -File -Recurse -Path \"${contents}\" | `