Compare commits
6 Commits
main
...
chached_st
| Author | SHA1 | Date | |
|---|---|---|---|
| 5a13431603 | |||
| 49e16a8077 | |||
| 2075b35f7b | |||
| 4c1f36e5f8 | |||
| b62e34eea2 | |||
| 433e6a2727 |
@@ -9,16 +9,13 @@
|
|||||||
},
|
},
|
||||||
"customizations": {
|
"customizations": {
|
||||||
"vscode": {
|
"vscode": {
|
||||||
"settings": {
|
|
||||||
"terminal.integrated.defaultProfile.linux": "dev-shell"
|
|
||||||
},
|
|
||||||
"extensions": [
|
"extensions": [
|
||||||
"formulahendry.dotnet-test-explorer",
|
"formulahendry.dotnet-test-explorer",
|
||||||
"jnoortheen.nix-ide",
|
"jnoortheen.nix-ide",
|
||||||
"eamodio.gitlens"
|
"eamodio.gitlens"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
|
||||||
// Features to add to the dev container. More info: https://containers.dev/features.
|
// Features to add to the dev container. More info: https://containers.dev/features.
|
||||||
// "features": {},
|
// "features": {},
|
||||||
@@ -32,7 +29,7 @@
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
// Use 'postCreateCommand' to run commands after the container is created.
|
// Use 'postCreateCommand' to run commands after the container is created.
|
||||||
// "postCreateCommand": "nix-env -i nixpkgs-fmt"
|
"postCreateCommand": "nix-env -i nixpkgs-fmt"
|
||||||
|
|
||||||
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
|
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
|
||||||
// "remoteUser": "root"
|
// "remoteUser": "root"
|
||||||
|
|||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -475,7 +475,4 @@ $RECYCLE.BIN/
|
|||||||
|
|
||||||
# Windows shortcuts
|
# Windows shortcuts
|
||||||
*.lnk
|
*.lnk
|
||||||
|
|
||||||
# project specific
|
|
||||||
result
|
result
|
||||||
MyTestConsoleApp
|
|
||||||
9
.vscode/settings.json
vendored
9
.vscode/settings.json
vendored
@@ -1,10 +1,3 @@
|
|||||||
{
|
{
|
||||||
"dotnet-test-explorer.testProjectPath": "**/*Tests.csproj",
|
"dotnet-test-explorer.testProjectPath": "**/*Tests.csproj"
|
||||||
"terminal.integrated.profiles.linux": {
|
|
||||||
"dev-shell": {
|
|
||||||
"path": "bash",
|
|
||||||
"args": [ "-c", "nix --experimental-features \"nix-command flakes\" develop"],
|
|
||||||
"overrideName": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
3
alias.sh
3
alias.sh
@@ -4,5 +4,4 @@ alias nixe='nix --experimental-features "nix-command flakes"'
|
|||||||
alias nulock='nixe run .#devTasks.updateNugetLock'
|
alias nulock='nixe run .#devTasks.updateNugetLock'
|
||||||
alias fllock='nixe run .#devTasks.updateFlakeLock'
|
alias fllock='nixe run .#devTasks.updateFlakeLock'
|
||||||
alias ulock='nulock && fllock'
|
alias ulock='nulock && fllock'
|
||||||
alias .net='nixe run .#devTasks.runDotNet -- $@'
|
alias restore-on-current-source='nixe build && dotnet nuget locals all -c && dotnet restore -s result/share -s https://api.nuget.org/v3/index.json $1'
|
||||||
alias rat='nixe run .#devTasks.runAllTests'
|
|
||||||
132
flake.nix
132
flake.nix
@@ -30,6 +30,9 @@
|
|||||||
dotnet run --project ResourceString.Net.App.Console ResourceString.Net.Logic/Properties/Resources.resx ResourceString.Net.Logic.Properties > ResourceString.Net.Logic/Properties/Resources.cs.tmp
|
dotnet run --project ResourceString.Net.App.Console ResourceString.Net.Logic/Properties/Resources.resx ResourceString.Net.Logic.Properties > ResourceString.Net.Logic/Properties/Resources.cs.tmp
|
||||||
mv ResourceString.Net.Logic/Properties/Resources.cs.tmp ResourceString.Net.Logic/Properties/Resources.cs
|
mv ResourceString.Net.Logic/Properties/Resources.cs.tmp ResourceString.Net.Logic/Properties/Resources.cs
|
||||||
'';
|
'';
|
||||||
|
runAllTests = nixpkgsFor.${system}.writeScript "run_all_tests.sh" ''
|
||||||
|
dotnet test *.Tests
|
||||||
|
'';
|
||||||
buildAllAssemblies = nixpkgsFor.${system}.writeScript "build_all_assemblies.sh" ''
|
buildAllAssemblies = nixpkgsFor.${system}.writeScript "build_all_assemblies.sh" ''
|
||||||
# Find all .csproj files below the current folder
|
# Find all .csproj files below the current folder
|
||||||
csproj_files=$(find . -name '*.csproj')
|
csproj_files=$(find . -name '*.csproj')
|
||||||
@@ -73,128 +76,13 @@
|
|||||||
runDefaultApp = nixpkgsFor.${system}.writeScript "run_default_app.sh" ''
|
runDefaultApp = nixpkgsFor.${system}.writeScript "run_default_app.sh" ''
|
||||||
dotnet run --project ResourceString.Net.App.Console $@
|
dotnet run --project ResourceString.Net.App.Console $@
|
||||||
'';
|
'';
|
||||||
runDotNet = nixpkgsFor.${system}.writeScript "dotnet.sh" ''
|
createNugetPackage = nixpkgsFor.${system}.writeScript "run_default_app.sh" ''
|
||||||
if [ ! -d "result/share" ]; then
|
dotnet run --project ResourceString.Net.App.Console $@
|
||||||
nix --experimental-features 'nix-command flakes' build
|
|
||||||
fi
|
|
||||||
|
|
||||||
injectable_commands="restore$2 addpackage"
|
|
||||||
|
|
||||||
for value in $injectable_commands; do
|
|
||||||
if [ "$value" = "$1$2" ] || [ "$value" = "$1$3" ]; then
|
|
||||||
dotnet nuget locals all -c
|
|
||||||
dotnet $@ -s "result/share;https://api.nuget.org/v3/index.json"
|
|
||||||
exit $?
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
dotnet $@
|
|
||||||
'';
|
|
||||||
|
|
||||||
runAllTests = nixpkgsFor.${system}.writeScript "run_all_tests.sh" ''
|
|
||||||
dotnet test *.Tests
|
|
||||||
|
|
||||||
echo "# test package intregation"
|
|
||||||
|
|
||||||
echo "## test example app"
|
|
||||||
|
|
||||||
${scripts.${system}.runDotNet} restore example/Example.App/
|
|
||||||
${scripts.${system}.runDotNet} build example/Example.App/
|
|
||||||
output=$(${scripts.${system}.runDotNet} run --project example/Example.App/ --no-build | tr '\n' ' ')
|
|
||||||
|
|
||||||
expected_output="Hello Value1 2Value21{2} "
|
|
||||||
if [ "$output" = "$expected_output" ]; then
|
|
||||||
echo "Output matches the expected value."
|
|
||||||
else
|
|
||||||
echo "expected output is:"
|
|
||||||
echo $expected_output
|
|
||||||
|
|
||||||
echo "but was:"
|
|
||||||
echo $output
|
|
||||||
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "## test MyTestConsoleApp"
|
|
||||||
|
|
||||||
rm -rf MyTestConsoleApp
|
|
||||||
dotnet new console --name MyTestConsoleApp
|
|
||||||
|
|
||||||
echo "<Project Sdk=\"Microsoft.NET.Sdk\">
|
|
||||||
<PropertyGroup>
|
|
||||||
<OutputType>Exe</OutputType>
|
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<AdditionalFileItemNames>$(AdditionalFileItemNames);EmbeddedResource</AdditionalFileItemNames>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
" > MyTestConsoleApp/MyTestConsoleApp.csproj
|
|
||||||
|
|
||||||
${scripts.${system}.runDotNet} add MyTestConsoleApp package "System.Resources.Extensions"
|
|
||||||
${scripts.${system}.runDotNet} add MyTestConsoleApp package "ResourceString.Net"
|
|
||||||
|
|
||||||
echo "<?xml version='1.0' encoding='utf-8'?>
|
|
||||||
<root>
|
|
||||||
<data name='Greetings'>
|
|
||||||
<value>Hello {0}</value>
|
|
||||||
<comment>0 = name</comment>
|
|
||||||
</data>
|
|
||||||
<data name='World'>
|
|
||||||
<value>World</value>
|
|
||||||
</data>
|
|
||||||
</root>
|
|
||||||
" > MyTestConsoleApp/Resources.resx
|
|
||||||
|
|
||||||
echo "var message = MyTestConsoleApp.Resources.Greetings.From(
|
|
||||||
MyTestConsoleApp.Resources.World
|
|
||||||
);
|
|
||||||
|
|
||||||
Console.WriteLine(message.Value);
|
|
||||||
" > MyTestConsoleApp/Program.cs
|
|
||||||
|
|
||||||
echo "<?xml version='1.0' encoding='utf-8'?>
|
|
||||||
<root>
|
|
||||||
<data name='Greetings'>
|
|
||||||
<value>Hallo {0}</value>
|
|
||||||
<comment>0 = name</comment>
|
|
||||||
</data>
|
|
||||||
<data name='World'>
|
|
||||||
<value>Welt</value>
|
|
||||||
</data>
|
|
||||||
</root>
|
|
||||||
" > MyTestConsoleApp/Resources.de.resx
|
|
||||||
|
|
||||||
echo "
|
|
||||||
Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.GetCultureInfo(\"de-DE\");
|
|
||||||
|
|
||||||
Console.WriteLine(message.Value);
|
|
||||||
" >> MyTestConsoleApp/Program.cs
|
|
||||||
|
|
||||||
${scripts.${system}.runDotNet} restore MyTestConsoleApp
|
|
||||||
${scripts.${system}.runDotNet} build MyTestConsoleApp
|
|
||||||
output=$(${scripts.${system}.runDotNet} run --project MyTestConsoleApp --no-build | tr '\n' ' ')
|
|
||||||
|
|
||||||
expected_output="Hello World Hallo Welt "
|
|
||||||
if [ "$output" = "$expected_output" ]; then
|
|
||||||
echo "Output matches the expected value."
|
|
||||||
else
|
|
||||||
echo "expected output is:"
|
|
||||||
echo $expected_output
|
|
||||||
|
|
||||||
echo "but was:"
|
|
||||||
echo $output
|
|
||||||
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
in rec {
|
in
|
||||||
|
rec {
|
||||||
packages = forAllSystems (system: {
|
packages = forAllSystems (system: {
|
||||||
default = nixpkgsFor.${system}.buildDotnetModule {
|
default = nixpkgsFor.${system}.buildDotnetModule {
|
||||||
pname = name;
|
pname = name;
|
||||||
@@ -252,10 +140,6 @@
|
|||||||
type = "app";
|
type = "app";
|
||||||
program = "${scripts.${system}.cleanAllAssemblies}";
|
program = "${scripts.${system}.cleanAllAssemblies}";
|
||||||
};
|
};
|
||||||
runDotNet = {
|
|
||||||
type = "app";
|
|
||||||
program = "${scripts.${system}.runDotNet}";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -265,7 +149,7 @@
|
|||||||
packages =
|
packages =
|
||||||
[ nixpkgsFor.${system}.dotnet-sdk nixpkgsFor.${system}.nixfmt ];
|
[ nixpkgsFor.${system}.dotnet-sdk nixpkgsFor.${system}.nixfmt ];
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
. ./alias.sh
|
alias nixe="nix --experimental-features 'nix-command flakes'"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user