Skip to content

Commit 84e8427

Browse files
[FSSDK-11731] relative path approach
1 parent 28f79f3 commit 84e8427

File tree

2 files changed

+36
-26
lines changed

2 files changed

+36
-26
lines changed

.github/workflows/csharp.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
uses: microsoft/setup-msbuild@v1
4545
- name: Setup NuGet
4646
uses: NuGet/setup-nuget@v1
47-
- name: Download and Install .NET Framework Reference Assemblies
47+
- name: Download and Extract .NET Framework Reference Assemblies
4848
run: |
4949
# Create temp directory
5050
New-Item -ItemType Directory -Path "temp_ref_assemblies" -Force
@@ -57,33 +57,38 @@ jobs:
5757
echo "Downloading .NET 4.5 Reference Assemblies..."
5858
Invoke-WebRequest -Uri "https://www.nuget.org/api/v2/package/Microsoft.NETFramework.ReferenceAssemblies.net45/1.0.3" -OutFile "temp_ref_assemblies/net45_ref.zip"
5959
60-
# Extract and install .NET 4.0
61-
echo "Installing .NET 4.0 Reference Assemblies..."
60+
# Extract .NET 4.0 Reference Assemblies
61+
echo "Extracting .NET 4.0 Reference Assemblies..."
6262
Expand-Archive -Path "temp_ref_assemblies/net40_ref.zip" -DestinationPath "temp_ref_assemblies/net40" -Force
6363
if (Test-Path "temp_ref_assemblies/net40/build/.NETFramework/v4.0") {
64-
Copy-Item -Path "temp_ref_assemblies/net40/build/.NETFramework/v4.0" -Destination "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\" -Recurse -Force
65-
echo "✓ .NET 4.0 Reference Assemblies installed"
64+
echo "✓ .NET 4.0 Reference Assemblies extracted to workspace"
6665
}
6766
68-
# Extract and install .NET 4.5
69-
echo "Installing .NET 4.5 Reference Assemblies..."
67+
# Extract .NET 4.5 Reference Assemblies
68+
echo "Extracting .NET 4.5 Reference Assemblies..."
7069
Expand-Archive -Path "temp_ref_assemblies/net45_ref.zip" -DestinationPath "temp_ref_assemblies/net45" -Force
7170
if (Test-Path "temp_ref_assemblies/net45/build/.NETFramework/v4.5") {
72-
Copy-Item -Path "temp_ref_assemblies/net45/build/.NETFramework/v4.5" -Destination "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\" -Recurse -Force
73-
echo "✓ .NET 4.5 Reference Assemblies installed"
71+
echo "✓ .NET 4.5 Reference Assemblies extracted to workspace"
7472
}
75-
76-
# Cleanup
77-
Remove-Item -Path "temp_ref_assemblies" -Recurse -Force
7873
- name: Restore NuGet packages
7974
run: nuget restore ./OptimizelySDK.NETFramework.sln
8075
- name: Build & strongly name assemblies
81-
run: msbuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(pwd)/keypair.snk /p:Configuration=Release ./OptimizelySDK.NETFramework.sln
76+
run: |
77+
# Build with workspace-relative reference assembly paths
78+
$Net40RefPath = "$(pwd)\temp_ref_assemblies\net40\build\.NETFramework\v4.0"
79+
$Net45RefPath = "$(pwd)\temp_ref_assemblies\net45\build\.NETFramework\v4.5"
80+
81+
echo "Using .NET 4.0 Reference Assemblies from: $Net40RefPath"
82+
echo "Using .NET 4.5 Reference Assemblies from: $Net45RefPath"
83+
84+
msbuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(pwd)/keypair.snk /p:Configuration=Release /p:FrameworkPathOverride="$Net45RefPath" ./OptimizelySDK.NETFramework.sln
8285
- name: Install & Run NUnit tests
8386
run: |
8487
nuget install NUnit.Console -Version 3.18.1 -DirectDownload -OutputDirectory .
8588
# https://docs.nunit.org/articles/nunit/running-tests/Console-Command-Line.html
8689
./NUnit.ConsoleRunner.3.18.1\tools\nunit3-console.exe /timeout 10000 /process Separate ./OptimizelySDK.Tests/bin/Release/OptimizelySDK.Tests.dll
90+
- name: Cleanup reference assemblies
91+
run: Remove-Item -Path "temp_ref_assemblies" -Recurse -Force
8792

8893
netStandard16:
8994
name: Build Standard 1.6

.github/workflows/csharp_release.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: microsoft/setup-msbuild@v2
4242
- name: Setup NuGet
4343
uses: nuget/setup-nuget@v2
44-
- name: Download and Install .NET Framework Reference Assemblies
44+
- name: Download and Extract .NET Framework Reference Assemblies
4545
run: |
4646
# Create temp directory
4747
New-Item -ItemType Directory -Path "temp_ref_assemblies" -Force
@@ -54,28 +54,33 @@ jobs:
5454
echo "Downloading .NET 4.5 Reference Assemblies..."
5555
Invoke-WebRequest -Uri "https://www.nuget.org/api/v2/package/Microsoft.NETFramework.ReferenceAssemblies.net45/1.0.3" -OutFile "temp_ref_assemblies/net45_ref.zip"
5656
57-
# Extract and install .NET 4.0
58-
echo "Installing .NET 4.0 Reference Assemblies..."
57+
# Extract .NET 4.0 Reference Assemblies
58+
echo "Extracting .NET 4.0 Reference Assemblies..."
5959
Expand-Archive -Path "temp_ref_assemblies/net40_ref.zip" -DestinationPath "temp_ref_assemblies/net40" -Force
6060
if (Test-Path "temp_ref_assemblies/net40/build/.NETFramework/v4.0") {
61-
Copy-Item -Path "temp_ref_assemblies/net40/build/.NETFramework/v4.0" -Destination "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\" -Recurse -Force
62-
echo "✓ .NET 4.0 Reference Assemblies installed"
61+
echo "✓ .NET 4.0 Reference Assemblies extracted to workspace"
6362
}
6463
65-
# Extract and install .NET 4.5
66-
echo "Installing .NET 4.5 Reference Assemblies..."
64+
# Extract .NET 4.5 Reference Assemblies
65+
echo "Extracting .NET 4.5 Reference Assemblies..."
6766
Expand-Archive -Path "temp_ref_assemblies/net45_ref.zip" -DestinationPath "temp_ref_assemblies/net45" -Force
6867
if (Test-Path "temp_ref_assemblies/net45/build/.NETFramework/v4.5") {
69-
Copy-Item -Path "temp_ref_assemblies/net45/build/.NETFramework/v4.5" -Destination "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\" -Recurse -Force
70-
echo "✓ .NET 4.5 Reference Assemblies installed"
68+
echo "✓ .NET 4.5 Reference Assemblies extracted to workspace"
7169
}
72-
73-
# Cleanup
74-
Remove-Item -Path "temp_ref_assemblies" -Recurse -Force
7570
- name: Restore NuGet packages
7671
run: nuget restore ./OptimizelySDK.NETFramework.sln
7772
- name: Build and strongly name assemblies
78-
run: msbuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(pwd)/keypair.snk /p:Configuration=Release ./OptimizelySDK.NETFramework.sln
73+
run: |
74+
# Build with workspace-relative reference assembly paths
75+
$Net40RefPath = "$(pwd)\temp_ref_assemblies\net40\build\.NETFramework\v4.0"
76+
$Net45RefPath = "$(pwd)\temp_ref_assemblies\net45\build\.NETFramework\v4.5"
77+
78+
echo "Using .NET 4.0 Reference Assemblies from: $Net40RefPath"
79+
echo "Using .NET 4.5 Reference Assemblies from: $Net45RefPath"
80+
81+
msbuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(pwd)/keypair.snk /p:Configuration=Release /p:FrameworkPathOverride="$Net45RefPath" ./OptimizelySDK.NETFramework.sln
82+
- name: Cleanup reference assemblies
83+
run: Remove-Item -Path "temp_ref_assemblies" -Recurse -Force
7984
- name: Upload Framework artifacts
8085
uses: actions/upload-artifact@v4
8186
with:

0 commit comments

Comments
 (0)