Skip to content

Commit aeb2d4f

Browse files
Revert "[FSSDK-11731] different approach"
This reverts commit cf68b37.
1 parent cf68b37 commit aeb2d4f

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

.github/workflows/csharp.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,9 @@ jobs:
4646
uses: NuGet/setup-nuget@v1
4747
- name: Install .NET Framework Developer Packs
4848
run: |
49-
# Install .NET 4.5.2 developer pack (this works reliably)
5049
choco install netfx-4.5.2-devpack -y
51-
52-
# Check what targeting packs are already available
53-
echo "Checking available targeting packs..."
54-
dir "C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools" || echo "No .NET 4.0 tools found"
55-
dir "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework" || echo "No reference assemblies found"
56-
57-
# Try to install .NET 4.0 targeting pack from a different source
58-
echo "Attempting to download .NET 4.0 targeting pack..."
59-
Invoke-WebRequest -Uri "https://download.microsoft.com/download/1/B/E/1BE39E79-7E39-46A3-96FF-047F95396215/dotNetFx40_Full_setup.exe" -OutFile "dotnet40.exe"
60-
.\dotnet40.exe /quiet /norestart || echo "Installation failed or already installed"
61-
continue-on-error: true
50+
choco install windows-sdk-7.1 -y
51+
choco install netfx-4.0.3-devpack -y
6252
- name: Restore NuGet packages
6353
run: nuget restore ./OptimizelySDK.NETFramework.sln
6454
- name: Build & strongly name assemblies

.github/workflows/csharp_release.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,9 @@ jobs:
4343
uses: nuget/setup-nuget@v2
4444
- name: Install .NET Framework Developer Packs
4545
run: |
46-
# Install .NET 4.5.2 developer pack (this works reliably)
4746
choco install netfx-4.5.2-devpack -y
48-
49-
# Check what targeting packs are already available
50-
echo "Checking available targeting packs..."
51-
dir "C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools" || echo "No .NET 4.0 tools found"
52-
dir "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework" || echo "No reference assemblies found"
53-
54-
# Try to install .NET 4.0 targeting pack from a different source
55-
echo "Attempting to download .NET 4.0 targeting pack..."
56-
Invoke-WebRequest -Uri "https://download.microsoft.com/download/1/B/E/1BE39E79-7E39-46A3-96FF-047F95396215/dotNetFx40_Full_setup.exe" -OutFile "dotnet40.exe"
57-
.\dotnet40.exe /quiet /norestart || echo "Installation failed or already installed"
58-
continue-on-error: true
47+
choco install windows-sdk-7.1 -y
48+
choco install netfx-4.0.3-devpack -y
5949
- name: Restore NuGet packages
6050
run: nuget restore ./OptimizelySDK.NETFramework.sln
6151
- name: Build and strongly name assemblies

0 commit comments

Comments
 (0)